Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev

2014-05-29 19:23:48 +00:00
parent f0db8b622b 8e5372fe93
commit 2fd1d454b8
1 changed files with 1 additions and 1 deletions
--- 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);
    }

    /**