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

Merge "Fix regression in expanded action view up" into jb-mr1.1-dev

Browse Source
This commit is contained in:
Adam Powell
2013-02-04 21:43:15 +00:00
committed by Android (Google) Code Review
parent 98ffd11c25 62f33030b9
commit 67389e0ace
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,6 +122,7 @@ public class ActionBarView extends AbsActionBarView {
private boolean mIncludeTabs;
private boolean mIsCollapsable;
private boolean mIsCollapsed;
private boolean mWasHomeEnabled; // Was it enabled before action view expansion?
private MenuBuilder mOptionsMenu;
@@ -227,6 +228,15 @@ public class ActionBarView extends AbsActionBarView {
mExpandedHomeLayout.setContentDescription(getResources().getText(
R.string.action_bar_up_description));
// This needs to highlight/be focusable on its own.
// TODO: Clean up the handoff between expanded/normal.
final Drawable upBackground = mUpGoerFive.getBackground();
if (upBackground != null) {
mExpandedHomeLayout.setBackground(upBackground.getConstantState().newDrawable());
}
mExpandedHomeLayout.setEnabled(true);
mExpandedHomeLayout.setFocusable(true);
mTitleStyleRes = a.getResourceId(R.styleable.ActionBar_titleTextStyle, 0);
mSubtitleStyleRes = a.getResourceId(R.styleable.ActionBar_subtitleTextStyle, 0);
mProgressStyle = a.getResourceId(R.styleable.ActionBar_progressBarStyle, 0);
@@ -1529,6 +1539,8 @@ public class ActionBarView extends AbsActionBarView {
if (mTabScrollView != null) mTabScrollView.setVisibility(GONE);
if (mSpinner != null) mSpinner.setVisibility(GONE);
if (mCustomNavView != null) mCustomNavView.setVisibility(GONE);
mWasHomeEnabled = mUpGoerFive.isEnabled();
setHomeButtonEnabled(false);
requestLayout();
item.setActionViewExpanded(true);
@@ -1571,6 +1583,7 @@ public class ActionBarView extends AbsActionBarView {
}
mExpandedHomeLayout.setIcon(null);
mCurrentExpandedItem = null;
setHomeButtonEnabled(mWasHomeEnabled); // Set by expandItemActionView above
requestLayout();
item.setActionViewExpanded(false);