commit 7d330757d9194435e75d70681a93eee2308608fd
author Adam Powell <adamp@google.com> Thu May 29 19:27:17 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 29 19:27:17 2014 +0000
tree fa718451eaf7153ef89d795347490821b1e179c7
parent 36aad060c6f42e753d4073aba0b194269b162868
parent 2fd1d454b808006e41c052ac70dfabd86ecc924e

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

* commit 'ee1a3f1612cb69fe5567bf7cde2496a4774ab8ed':
  Fix for setting Toolbar content descriptions

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);
     }
 
     /**