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

Commit c793c9eb authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Add a missing condition when checking measurement for ActionBarContainer" into lmp-dev

parents 931b2e7c a12aaa75

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

+3 −0
Original line number Diff line number Diff line
@@ -272,6 +272,9 @@ public class ActionBarContainer extends FrameLayout { 
        final int childCount = getChildCount();

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

            final View child = getChildAt(i);

            if (child == mTabContainer) {

                continue;

            }

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

            nonTabMaxHeight = isCollapsed(child) ? 0 :

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