diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-10-14 17:30:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 17:30:27 +0000 |
| commit | 755799c7076c4f2732f2b4c4925febdad4786ff2 (patch) | |
| tree | 9686a3a4e5b15ead6f03f25f2e4353a8d0632c2e /packages | |
| parent | 3f2c8122f0ac70659e55151d4c56e8ff11a26c14 (diff) | |
| parent | 7d5e9455f479d3a2685c84388ef752d08c49e7fc (diff) | |
| download | frameworks_base-755799c7076c4f2732f2b4c4925febdad4786ff2.zip frameworks_base-755799c7076c4f2732f2b4c4925febdad4786ff2.tar.gz frameworks_base-755799c7076c4f2732f2b4c4925febdad4786ff2.tar.bz2 | |
am 7d5e9455: am 86195bd9: am 1229d266: am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev
* commit '7d5e9455f479d3a2685c84388ef752d08c49e7fc':
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) { |