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

Commit 0714e37c authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am a7e028a9: am cef582ab: am 07cf971e: Fix re-enabled state of up after action view collapse 

# Via Android Git Automerger (2) and Adam Powell (1)
* commit 'a7e028a9':
  Fix re-enabled state of up after action view collapse
parents c92199be a7e028a9

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

+16 −2
Original line number Diff line number Diff line
@@ -559,6 +559,21 @@ public class ActionBarView extends AbsActionBarView { 
    }



    public void setHomeButtonEnabled(boolean enable) {

        setHomeButtonEnabled(enable, true);

    }



    private void setHomeButtonEnabled(boolean enable, boolean recordState) {

        if (recordState) {

            mWasHomeEnabled = enable;

        }



        if (mExpandedActionView != null) {

            // There's an action view currently showing and we want to keep the state

            // configured for the action view at the moment. If we needed to record the

            // new state for later we will have done so above.

            return;

        }



        mUpGoerFive.setEnabled(enable);

        mUpGoerFive.setFocusable(enable);

        // Make sure the home button has an accurate content description for accessibility.
@@ -1539,8 +1554,7 @@ 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);

            setHomeButtonEnabled(false, false);

            requestLayout();

            item.setActionViewExpanded(true);