Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7f51ae71: Merge "Fix some visibility state transition issues with ActionBarView" into jb-mr2-dev

Browse Source 
* commit '7f51ae71f170f61439516321a107507c4d1c0ac0':
  Fix some visibility state transition issues with ActionBarView
This commit is contained in:
Adam Powell
2013-03-26 15:56:45 -07:00
committed by Android Git Automerger
parent ed7d0e0e65 7f51ae71f1
commit 36375eca1a
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -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