commit a8743f152aac4a8ef97c79bdad5232614453ce2a
author Adam Powell <adamp@google.com> Fri Nov 11 18:35:53 2011 -0800
committer Adam Powell <adamp@google.com> Fri Nov 11 18:35:53 2011 -0800
tree fe80af7f3fe828e42dbcbe482a689658a8104563
parent c51bb4d394dd47e48abc8a6d9cbc740f821546ff

Fix bug 5425280 - Two ActionBar icons show up

Change-Id: Ic82f8ce648f9314a0800eeff326df7d8dfe5027b

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