diff options
| author | 2011-11-14 07:46:00 -0800 | |
|---|---|---|
| committer | 2011-11-14 07:46:00 -0800 | |
| commit | b22eec57d559fc9dd5663abdc37d6b6e6a4f641f (patch) | |
| tree | 279f200608fda96bd1f36a2d0421b0282edd46d7 | |
| parent | 30870e32de4d7338d0aa957458ec63df9806f9da (diff) | |
| parent | a8743f152aac4a8ef97c79bdad5232614453ce2a (diff) | |
am a8743f15: Fix bug 5425280 - Two ActionBar icons show up
* commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a':
Fix bug 5425280 - Two ActionBar icons show up
| -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 4714be8df3d9..b689f536c3cb 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) { |