commit 8e5372fe93ee2ee3bf20baab9054b39b4c5043ce
author Adam Powell <adamp@google.com> Thu May 29 12:16:09 2014 -0700
committer Adam Powell <adamp@google.com> Thu May 29 12:16:09 2014 -0700
tree 83589cb4cacb34880c5e68742fb9aee8e6d02baa
parent 71ac80c46a1b094ad951e59c24791d9e9ef769bf

Fix for setting Toolbar content descriptions

Allow resid 0 as a null content description.

Change-Id: I0663feac229a77d5efffece2bd686de4ee99d840

core/java/android/widget/Toolbar.java

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 void setNavigationContentDescription(int resId) {
         ensureNavButtonView();
-        mNavButtonView.setContentDescription(getContext().getText(resId));
+        mNavButtonView.setContentDescription(resId != 0 ? getContext().getText(resId) : null);
     }
 
     /**