Fix bug 5425280 - Two ActionBar icons show up

Change-Id: Ic82f8ce648f9314a0800eeff326df7d8dfe5027b

Author: adamp

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

@@ -537,7 +537,7 @@ public void setDisplayOptions(int options) {
 
         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) {