Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev

Browse Source 
* commit '70e376964be45525f1f0e90f35570415dce6d1df':
  Fix ActionBar#setHomeActionContentDescription(0)
This commit is contained in:
Adam Powell
2013-04-18 14:46:17 -07:00
committed by Android Git Automerger
parent d2b8cd75ed 70e376964b
commit 61a826eff1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -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 {