diff options
author | Tomasz Mikolajewski <mtomasz@google.com> | 2015-06-18 00:15:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-18 00:15:52 +0000 |
commit | 41ce003934c228f68e82645062665e0d2c443781 (patch) | |
tree | ebdb4567dffc8e198b05fcaa1090a4b677cf72bd /packages | |
parent | 512fb0ca900128cb682491a7f85e20c17edd8481 (diff) | |
parent | 536ac48aa9268539913c210267679ded906057ca (diff) | |
download | frameworks_base-41ce003934c228f68e82645062665e0d2c443781.zip frameworks_base-41ce003934c228f68e82645062665e0d2c443781.tar.gz frameworks_base-41ce003934c228f68e82645062665e0d2c443781.tar.bz2 |
Merge "Remove the action bar icon when there is no drawer enabled." into mnc-dev
Diffstat (limited to 'packages')
-rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index 4211406..fe148da 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -408,15 +408,8 @@ public class DocumentsActivity extends BaseActivity { } } - final RootInfo root = getCurrentRoot(); - final boolean showRootIcon = mShowAsDialog - || (mState.action == ACTION_MANAGE || mState.action == ACTION_BROWSE); - if (showRootIcon) { - mToolbar.setNavigationIcon( - root != null ? root.loadToolbarIcon(mToolbar.getContext()) : null); - mToolbar.setNavigationContentDescription(R.string.drawer_open); - mToolbar.setNavigationOnClickListener(null); - } else { + if (!mShowAsDialog && mDrawerLayout.getDrawerLockMode(mRootsDrawer) == + DrawerLayout.LOCK_MODE_UNLOCKED) { mToolbar.setNavigationIcon(R.drawable.ic_hamburger); mToolbar.setNavigationContentDescription(R.string.drawer_open); mToolbar.setNavigationOnClickListener(new View.OnClickListener() { @@ -425,6 +418,10 @@ public class DocumentsActivity extends BaseActivity { setRootsDrawerOpen(true); } }); + } else { + mToolbar.setNavigationIcon(null); + mToolbar.setNavigationContentDescription(R.string.drawer_open); + mToolbar.setNavigationOnClickListener(null); } if (mSearchManager.isExpanded()) { @@ -433,7 +430,7 @@ public class DocumentsActivity extends BaseActivity { mToolbarStack.setAdapter(null); } else { if (mState.stack.size() <= 1) { - mToolbar.setTitle(root.title); + mToolbar.setTitle(getCurrentRoot().title); mToolbarStack.setVisibility(View.GONE); mToolbarStack.setAdapter(null); } else { |