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

* commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a':
  Fix bug 5425280 - Two ActionBar icons show up
This commit is contained in:
Adam Powell
2011-11-14 07:46:00 -08:00
committed by Android Git Automerger

View File

@@ -537,7 +537,7 @@ public class ActionBarView extends AbsActionBarView {
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) {