diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-10-13 22:08:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-13 22:08:35 +0000 |
| commit | 1229d266f60b9e40e92a5fcee8baeaedd7e8c367 (patch) | |
| tree | 9b6d48e1784e845be32fe986770687ba4c1c4399 /packages | |
| parent | 8d3cf106aa53ccf03c9f57c4e3b4af5799e2b530 (diff) | |
| parent | c4d774d5d87439180eed0be45eb2242f8bf7cfaa (diff) | |
| download | frameworks_base-1229d266f60b9e40e92a5fcee8baeaedd7e8c367.zip frameworks_base-1229d266f60b9e40e92a5fcee8baeaedd7e8c367.tar.gz frameworks_base-1229d266f60b9e40e92a5fcee8baeaedd7e8c367.tar.bz2 | |
am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev
* commit 'c4d774d5d87439180eed0be45eb2242f8bf7cfaa':
DocumentsUI: Add content description for nav.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index 0ed82d9..fef1f4a 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -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) { |