From 6684e92ae83fab00108bf2964e703d1037c0b882 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Tue, 26 Mar 2013 15:38:26 -0700 Subject: [PATCH] Fix some visibility state transition issues with ActionBarView Restore state as expected for titles and expanded action views. Bug 8246128 Bug 8479205 Change-Id: Icad59685c5eab241f19ecd94479dc5e7a9f678b6 --- .../android/internal/widget/ActionBarView.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 6bb7ac791405d..d1db230f507c4 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -835,6 +835,8 @@ public class ActionBarView extends AbsActionBarView { (TextUtils.isEmpty(mTitle) && TextUtils.isEmpty(mSubtitle))) { // Don't show while in expanded mode or with empty text mTitleLayout.setVisibility(GONE); + } else { + mTitleLayout.setVisibility(VISIBLE); } } @@ -1587,15 +1589,10 @@ public class ActionBarView extends AbsActionBarView { mTitleLayout.setVisibility(VISIBLE); } } - if (mTabScrollView != null && mNavigationMode == ActionBar.NAVIGATION_MODE_TABS) { - mTabScrollView.setVisibility(VISIBLE); - } - if (mSpinner != null && mNavigationMode == ActionBar.NAVIGATION_MODE_LIST) { - mSpinner.setVisibility(VISIBLE); - } - if (mCustomNavView != null && (mDisplayOptions & ActionBar.DISPLAY_SHOW_CUSTOM) != 0) { - mCustomNavView.setVisibility(VISIBLE); - } + if (mTabScrollView != null) mTabScrollView.setVisibility(VISIBLE); + if (mSpinner != null) mSpinner.setVisibility(VISIBLE); + if (mCustomNavView != null) mCustomNavView.setVisibility(VISIBLE); + mExpandedHomeLayout.setIcon(null); mCurrentExpandedItem = null; setHomeButtonEnabled(mWasHomeEnabled); // Set by expandItemActionView above