diff options
| author | Adam Powell <adamp@google.com> | 2011-08-11 20:07:11 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-08-11 20:09:31 -0700 |
| commit | 71f34174e977bac7283696d45c17baaa4f1f1503 (patch) | |
| tree | aea557a04a40aed4d2b6be37b65d597990c0f009 | |
| parent | 0e382005eb5ca3f71c9b374b9ffb6cd95dc3a081 (diff) | |
| download | frameworks_base-71f34174e977bac7283696d45c17baaa4f1f1503.zip frameworks_base-71f34174e977bac7283696d45c17baaa4f1f1503.tar.gz frameworks_base-71f34174e977bac7283696d45c17baaa4f1f1503.tar.bz2 | |
Fix bug 5156213 - Fix title visibility states wrt expanded action views.
Change-Id: I20b5c5ad8112bec17e4cb5d6e568f47005a4e731
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 181958c..d72a78d 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -462,8 +462,9 @@ public class ActionBarView extends AbsActionBarView { mTitle = title; if (mTitleView != null) { mTitleView.setText(title); - mTitleLayout.setVisibility(TextUtils.isEmpty(mTitle) && TextUtils.isEmpty(mSubtitle) ? - GONE : VISIBLE); + mTitleLayout.setVisibility(mExpandedActionView != null && + (mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0 && + (!TextUtils.isEmpty(mTitle) || !TextUtils.isEmpty(mSubtitle)) ? VISIBLE : GONE); } if (mLogoNavItem != null) { mLogoNavItem.setTitle(title); @@ -479,8 +480,9 @@ public class ActionBarView extends AbsActionBarView { if (mSubtitleView != null) { mSubtitleView.setText(subtitle); mSubtitleView.setVisibility(subtitle != null ? VISIBLE : GONE); - mTitleLayout.setVisibility(TextUtils.isEmpty(mTitle) && TextUtils.isEmpty(mSubtitle) ? - GONE : VISIBLE); + mTitleLayout.setVisibility(mExpandedActionView != null && + (mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0 && + (!TextUtils.isEmpty(mTitle) || !TextUtils.isEmpty(mSubtitle)) ? VISIBLE : GONE); } } @@ -739,7 +741,12 @@ public class ActionBarView extends AbsActionBarView { mTitleLayout.setEnabled(titleUp); } - addView(mTitleLayout); + addView(mTitleLayout, new LayoutParams(LayoutParams.WRAP_CONTENT, + LayoutParams.MATCH_PARENT)); + if (mExpandedActionView != null) { + // Don't show while in expanded mode + mTitleLayout.setVisibility(GONE); + } } public void setContextView(ActionBarContextView view) { |