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

Commit aa8e509b authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 5091886 - action bar measurement 

Change the measurement order of elements in the action bar. Custom
views are now deemed more important and may truncate title/subtitle.

Change-Id: I150862f8e48b36bcbd892f49d78c2962c5001ab1
parent 12bde60b

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

+18 −16
Original line number Diff line number Diff line
@@ -826,15 +826,18 @@ public class ActionBarView extends AbsActionBarView { 
            rightOfCenter = Math.max(0, rightOfCenter - mMenuView.getMeasuredWidth());

        }



        if (mExpandedActionView == null) {

            boolean showTitle = mTitleLayout != null && mTitleLayout.getVisibility() != GONE &&

                    (mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0;

            if (showTitle) {

                availableWidth = measureChildView(mTitleLayout, availableWidth,

                        MeasureSpec.makeMeasureSpec(mContentHeight, MeasureSpec.EXACTLY), 0);

                leftOfCenter = Math.max(0, leftOfCenter - mTitleLayout.getMeasuredWidth());

        if (mIndeterminateProgressView != null &&

                mIndeterminateProgressView.getVisibility() != GONE) {

            availableWidth = measureChildView(mIndeterminateProgressView, availableWidth,

                    childSpecHeight, 0);

            rightOfCenter = Math.max(0,

                    rightOfCenter - mIndeterminateProgressView.getMeasuredWidth());

        }



        final boolean showTitle = mTitleLayout != null && mTitleLayout.getVisibility() != GONE &&

                (mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0;



        if (mExpandedActionView == null) {

            switch (mNavigationMode) {

                case ActionBar.NAVIGATION_MODE_LIST:

                    if (mListNavLayout != null) {
@@ -865,14 +868,6 @@ public class ActionBarView extends AbsActionBarView { 
            }

        }



        if (mIndeterminateProgressView != null &&

                mIndeterminateProgressView.getVisibility() != GONE) {

            availableWidth = measureChildView(mIndeterminateProgressView, availableWidth,

                    childSpecHeight, 0);

            rightOfCenter = Math.max(0,

                    rightOfCenter - mIndeterminateProgressView.getMeasuredWidth());

        }



        View customView = null;

        if (mExpandedActionView != null) {

            customView = mExpandedActionView;
@@ -922,6 +917,13 @@ public class ActionBarView extends AbsActionBarView { 
            customView.measure(

                    MeasureSpec.makeMeasureSpec(customNavWidth, customNavWidthMode),

                    MeasureSpec.makeMeasureSpec(customNavHeight, customNavHeightMode));

            availableWidth -= horizontalMargin + customView.getMeasuredWidth();

        }



        if (mExpandedActionView == null && showTitle) {

            availableWidth = measureChildView(mTitleLayout, availableWidth,

                    MeasureSpec.makeMeasureSpec(mContentHeight, MeasureSpec.EXACTLY), 0);

            leftOfCenter = Math.max(0, leftOfCenter - mTitleLayout.getMeasuredWidth());

        }



        if (mContentHeight <= 0) {