From 9f125d341521efc8535e32e35a641be50d405c36 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Fri, 14 Jan 2011 15:36:56 -0800
Subject: [PATCH] Fix bug 3339039 - Preserve proper behavior for action button
 text when updated.

Change-Id: If3529616d5a2b69638b2b0c4070d5ebbb418410c
---
 .../com/android/internal/view/menu/ActionMenuItemView.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/view/menu/ActionMenuItemView.java b/core/java/com/android/internal/view/menu/ActionMenuItemView.java
index 7218ddc090f08..3325df617de9b 100644
--- 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() {