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

am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev

Browse Source 
* commit '461b3896babdbfb365282378df89cde2dddb5a3a':
  DocumentsUI: Add content description for nav.
This commit is contained in:
Jeff Sharkey
2014-10-13 22:04:06 +00:00
committed by Android Git Automerger
parent d4b38fe5c0 461b3896ba
commit c4d774d5d8
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) {