Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev

2013-04-18 21:42:21 +00:00
parent adff8b7577 2eeb419e55
commit 70e376964b
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -1354,7 +1354,7 @@ public class ActionBarView extends AbsActionBarView {

    public void setHomeActionContentDescription(int resId) {
        mHomeDescriptionRes = resId;
-        mHomeDescription = getResources().getText(resId);
+        mHomeDescription = resId != 0 ? getResources().getText(resId) : null;
    }

    static class SavedState extends BaseSavedState {