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

Commit 7f1faf89 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "base: Check for homeAsUp status when collapse actionbar widget" into cm-11.0

parents 06c677cc 06747e9a

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

+6 −3
Original line number Diff line number Diff line
@@ -1665,9 +1665,12 @@ public class ActionBarView extends AbsActionBarView { 
            removeView(mExpandedActionView);

            mUpGoerFive.removeView(mExpandedHomeLayout);

            mExpandedActionView = null;

            if ((mDisplayOptions & ActionBar.DISPLAY_SHOW_HOME) != 0) {

                mHomeLayout.setVisibility(VISIBLE);

            }



            final boolean showHome = (mDisplayOptions & ActionBar.DISPLAY_SHOW_HOME) != 0;

            final boolean homeAsUp = (mDisplayOptions & ActionBar.DISPLAY_HOME_AS_UP) != 0;

            final int homeVis = (showHome || (!showHome && homeAsUp)) ? VISIBLE : GONE;

            mHomeLayout.setVisibility(homeVis);



            if ((mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0) {

                if (mTitleLayout == null) {

                    initTitle();