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

am 8e4d3ba6: Merge "Fix bug 3339039 - Preserve proper behavior for action button text when updated." into honeycomb

Browse Source 
* commit '8e4d3ba67824d87d832d90e1d0555456b3e76aca':
  Fix bug 3339039 - Preserve proper behavior for action button text when updated.
This commit is contained in:
Adam Powell
2011-01-14 15:43:03 -08:00
committed by Android Git Automerger
parent 909d447d8a 8e4d3ba678
commit 7bd540ac8e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/view/menu/ActionMenuItemView.java
View File

@@ -106,10 +106,11 @@ public class ActionMenuItemView extends LinearLayout
mImageButton.setImageDrawable(icon); mImageButton.setImageDrawable(icon);
if (icon != null) { if (icon != null) {
mImageButton.setVisibility(VISIBLE); mImageButton.setVisibility(VISIBLE);
mTextButton.setVisibility(GONE);
} else { } else {
mImageButton.setVisibility(GONE); mImageButton.setVisibility(GONE);
} }
mTextButton.setVisibility(icon == null || mItemData.showsTextAsAction() ? VISIBLE : GONE);
} }
public boolean hasText() { public boolean hasText() {