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

am 86195bd9: am 1229d266: am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev

Browse Source 
* commit '86195bd9a39436a9dc39de782e20892f51cf7397':
  DocumentsUI: Add content description for nav.
This commit is contained in:
Jeff Sharkey
2014-10-14 17:22:40 +00:00
committed by Android Git Automerger
parent 3e1732907b 86195bd9a3
commit 7d5e9455f4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -421,9 +421,11 @@ public class DocumentsActivity extends Activity {
if (showRootIcon) {
mToolbar.setNavigationIcon(
root != null ? root.loadToolbarIcon(mToolbar.getContext()) : null);
mToolbar.setNavigationContentDescription(R.string.drawer_open);
mToolbar.setNavigationOnClickListener(null);
} else {
mToolbar.setNavigationIcon(R.drawable.ic_hamburger);
mToolbar.setNavigationContentDescription(R.string.drawer_open);
mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {