Fix for setting Toolbar content descriptions

Allow resid 0 as a null content description.

Change-Id: I0663feac229a77d5efffece2bd686de4ee99d840
This commit is contained in:
Adam Powell
2014-05-29 12:16:09 -07:00
parent 71ac80c46a
commit 8e5372fe93

View File

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