From 3e8c34bdebe67c83cc8108efd5d87348640001de Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Thu, 27 Aug 2015 18:04:30 -0700 Subject: Some code cleanup on when to display what in drawer toggle --- .../java/github/daneren2005/dsub/activity/SubsonicActivity.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java') diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java index f336d178..f7cdd92c 100644 --- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -818,11 +818,12 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte if(currentFragment == null || currentFragment.getTitle() == null) { return; } - if(spinnerAdapter == null) { + if(spinnerAdapter == null || getSupportActionBar().getCustomView() == null) { createCustomActionBarView(); } if(backStack.size() > 0) { + createCustomActionBarView(); spinnerAdapter.clear(); for(int i = 0; i < backStack.size(); i++) { CharSequence title = backStack.get(i).getTitle(); @@ -842,9 +843,13 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte if(!isTv()) { getSupportActionBar().setDisplayShowCustomEnabled(true); } + + drawerToggle.setDrawerIndicatorEnabled(false); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); } else if(!isTv()) { getSupportActionBar().setTitle(currentFragment.getTitle()); getSupportActionBar().setDisplayShowCustomEnabled(false); + drawerToggle.setDrawerIndicatorEnabled(true); } } -- cgit v1.2.3