commit b22eec57d559fc9dd5663abdc37d6b6e6a4f641f
author Adam Powell <adamp@google.com> Mon Nov 14 07:46:00 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 14 07:46:00 2011 -0800
tree 279f200608fda96bd1f36a2d0421b0282edd46d7
parent 30870e32de4d7338d0aa957458ec63df9806f9da
parent a8743f152aac4a8ef97c79bdad5232614453ce2a

am a8743f15: Fix bug 5425280 - Two ActionBar icons show up

* commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a':
  Fix bug 5425280 - Two ActionBar icons show up

core/java/com/android/internal/widget/ActionBarView.java

diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 4714be8..b689f53 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -537,7 +537,7 @@
 
         if ((flagsChanged & DISPLAY_RELAYOUT_MASK) != 0) {
             final boolean showHome = (options & ActionBar.DISPLAY_SHOW_HOME) != 0;
-            final int vis = showHome ? VISIBLE : GONE;
+            final int vis = showHome && mExpandedActionView == null ? VISIBLE : GONE;
             mHomeLayout.setVisibility(vis);
 
             if ((flagsChanged & ActionBar.DISPLAY_HOME_AS_UP) != 0) {