diff options
| author | Adam Powell <adamp@google.com> | 2011-11-11 18:35:53 -0800 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-11-11 18:35:53 -0800 |
| commit | a8743f152aac4a8ef97c79bdad5232614453ce2a (patch) | |
| tree | fe80af7f3fe828e42dbcbe482a689658a8104563 /core | |
| parent | c51bb4d394dd47e48abc8a6d9cbc740f821546ff (diff) | |
| download | frameworks_base-a8743f152aac4a8ef97c79bdad5232614453ce2a.zip frameworks_base-a8743f152aac4a8ef97c79bdad5232614453ce2a.tar.gz frameworks_base-a8743f152aac4a8ef97c79bdad5232614453ce2a.tar.bz2 | |
Fix bug 5425280 - Two ActionBar icons show up
Change-Id: Ic82f8ce648f9314a0800eeff326df7d8dfe5027b
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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) { |