Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 569f138e authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

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

# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '67389e0a':
  Fix regression in expanded action view up
parents db3ace21 67389e0a

core/java/com/android/internal/widget/ActionBarView.java

+13 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,7 @@ public class ActionBarView extends AbsActionBarView { 
    private boolean mIncludeTabs;

    private boolean mIncludeTabs;

    private boolean mIsCollapsable;

    private boolean mIsCollapsable;

    private boolean mIsCollapsed;

    private boolean mIsCollapsed;

    private boolean mWasHomeEnabled; // Was it enabled before action view expansion?





    private MenuBuilder mOptionsMenu;

    private MenuBuilder mOptionsMenu;
@@ -227,6 +228,15 @@ public class ActionBarView extends AbsActionBarView { 
        mExpandedHomeLayout.setContentDescription(getResources().getText(

        mExpandedHomeLayout.setContentDescription(getResources().getText(

                R.string.action_bar_up_description));

                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);

        mTitleStyleRes = a.getResourceId(R.styleable.ActionBar_titleTextStyle, 0);

        mSubtitleStyleRes = a.getResourceId(R.styleable.ActionBar_subtitleTextStyle, 0);

        mSubtitleStyleRes = a.getResourceId(R.styleable.ActionBar_subtitleTextStyle, 0);

        mProgressStyle = a.getResourceId(R.styleable.ActionBar_progressBarStyle, 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 (mTabScrollView != null) mTabScrollView.setVisibility(GONE);

            if (mSpinner != null) mSpinner.setVisibility(GONE);

            if (mSpinner != null) mSpinner.setVisibility(GONE);

            if (mCustomNavView != null) mCustomNavView.setVisibility(GONE);

            if (mCustomNavView != null) mCustomNavView.setVisibility(GONE);

            mWasHomeEnabled = mUpGoerFive.isEnabled();

            setHomeButtonEnabled(false);

            requestLayout();

            requestLayout();

            item.setActionViewExpanded(true);

            item.setActionViewExpanded(true);
@@ -1571,6 +1583,7 @@ public class ActionBarView extends AbsActionBarView { 
            }

            }

            mExpandedHomeLayout.setIcon(null);

            mExpandedHomeLayout.setIcon(null);

            mCurrentExpandedItem = null;

            mCurrentExpandedItem = null;

            setHomeButtonEnabled(mWasHomeEnabled); // Set by expandItemActionView above

            requestLayout();

            requestLayout();

            item.setActionViewExpanded(false);

            item.setActionViewExpanded(false);