diff options
| author | Adam Powell <adamp@google.com> | 2014-05-29 19:23:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-29 19:23:48 +0000 |
| commit | 2fd1d454b808006e41c052ac70dfabd86ecc924e (patch) | |
| tree | ac42d79e9db95d0be5aa6807bf379070dbce5554 /core | |
| parent | f0db8b622b36ad33214579308a6caf804a4871d2 (diff) | |
| parent | 8e5372fe93ee2ee3bf20baab9054b39b4c5043ce (diff) | |
| download | frameworks_base-2fd1d454b808006e41c052ac70dfabd86ecc924e.zip frameworks_base-2fd1d454b808006e41c052ac70dfabd86ecc924e.tar.gz frameworks_base-2fd1d454b808006e41c052ac70dfabd86ecc924e.tar.bz2 | |
Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/Toolbar.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java index 8c67bb7..5033bee 100644 --- a/core/java/android/widget/Toolbar.java +++ b/core/java/android/widget/Toolbar.java @@ -592,7 +592,7 @@ public class Toolbar extends ViewGroup { */ public void setNavigationContentDescription(int resId) { ensureNavButtonView(); - mNavButtonView.setContentDescription(getContext().getText(resId)); + mNavButtonView.setContentDescription(resId != 0 ? getContext().getText(resId) : null); } /** |