diff options
| author | Adam Powell <adamp@google.com> | 2013-03-26 22:51:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-26 22:51:52 +0000 |
| commit | 7f51ae71f170f61439516321a107507c4d1c0ac0 (patch) | |
| tree | d93678990a601f7cb66706ecdb9d08ed1a810b86 /core/java/com/android | |
| parent | 05191053545065c9c71afae173d3ab42a2d947fa (diff) | |
| parent | 6684e92ae83fab00108bf2964e703d1037c0b882 (diff) | |
| download | frameworks_base-7f51ae71f170f61439516321a107507c4d1c0ac0.zip frameworks_base-7f51ae71f170f61439516321a107507c4d1c0ac0.tar.gz frameworks_base-7f51ae71f170f61439516321a107507c4d1c0ac0.tar.bz2 | |
Merge "Fix some visibility state transition issues with ActionBarView" into jb-mr2-dev
Diffstat (limited to 'core/java/com/android')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 15 |
1 files 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 6bb7ac7..d1db230 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 |