Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9223788e: am 327dbb57: am 41ce0039: Merge "Remove the action bar icon when there is no drawer enabled." into mnc-dev

Browse Source 
* commit '9223788e655784417e1cf0023d78b5d850dd0d1e':
  Remove the action bar icon when there is no drawer enabled.
This commit is contained in:
Tomasz Mikolajewski
2015-06-18 00:54:51 +00:00
committed by Android Git Automerger
parent e07cf1b030 9223788e65
commit 8a246ea3ff
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
View File

@@ -402,15 +402,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() {
@@ -419,6 +412,10 @@ public class DocumentsActivity extends BaseActivity {
setRootsDrawerOpen(true);
}
});
} else {
mToolbar.setNavigationIcon(null);
mToolbar.setNavigationContentDescription(R.string.drawer_open);
mToolbar.setNavigationOnClickListener(null);
}
if (mSearchManager.isExpanded()) {
@@ -427,7 +424,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 {