From 8e5372fe93ee2ee3bf20baab9054b39b4c5043ce Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Thu, 29 May 2014 12:16:09 -0700
Subject: [PATCH] Fix for setting Toolbar content descriptions

Allow resid 0 as a null content description.

Change-Id: I0663feac229a77d5efffece2bd686de4ee99d840
---
 core/java/android/widget/Toolbar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java
index 8c67bb770b5af..5033bee91b366 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);
     }
 
     /**