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

2011-01-14 15:40:07 -08:00
parent 0b08c5cb14 9f125d3415
commit 8e4d3ba678
1 changed files with 2 additions and 1 deletions
--- a/core/java/com/android/internal/view/menu/ActionMenuItemView.java
+++ b/core/java/com/android/internal/view/menu/ActionMenuItemView.java
@@ -106,10 +106,11 @@ public class ActionMenuItemView extends LinearLayout
        mImageButton.setImageDrawable(icon);
        if (icon != null) {
            mImageButton.setVisibility(VISIBLE);
-            mTextButton.setVisibility(GONE);
        } else {
            mImageButton.setVisibility(GONE);
        }
+
+        mTextButton.setVisibility(icon == null || mItemData.showsTextAsAction() ? VISIBLE : GONE);
    }
    
    public boolean hasText() {