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

Commit 635c21b0 authored by Adam Powell's avatar Adam Powell
Browse files

Fix measurement regression in ActionBarContainer 

Make sure that we take into account all child views (including
ActionBarContextViews) when measuring the action bar container to
determine the measurement influence of an additional tab bar.

Bug 16982971

Change-Id: I53ba7e9a4c9e36d97c6385d2007a3ee0a4e2bc77
parent 75f99187

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

+9 −4
Original line number Diff line number Diff line
@@ -268,16 +268,21 @@ public class ActionBarContainer extends FrameLayout { 


        if (mActionBarView == null) return;



        final LayoutParams lp = (LayoutParams) mActionBarView.getLayoutParams();

        final int actionBarViewHeight = isCollapsed(mActionBarView) ? 0 :

                mActionBarView.getMeasuredHeight() + lp.topMargin + lp.bottomMargin;

        int nonTabMaxHeight = 0;

        final int childCount = getChildCount();

        for (int i = 0; i < childCount; i++) {

            final View child = getChildAt(i);

            final LayoutParams lp = (LayoutParams) child.getLayoutParams();

            nonTabMaxHeight = isCollapsed(child) ? 0 :

                    child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin;

        }



        if (mTabContainer != null && mTabContainer.getVisibility() != GONE) {

            final int mode = MeasureSpec.getMode(heightMeasureSpec);

            if (mode == MeasureSpec.AT_MOST) {

                final int maxHeight = MeasureSpec.getSize(heightMeasureSpec);

                setMeasuredDimension(getMeasuredWidth(),

                        Math.min(actionBarViewHeight + mTabContainer.getMeasuredHeight(),

                        Math.min(nonTabMaxHeight + mTabContainer.getMeasuredHeight(),

                                maxHeight));

            }

        }