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

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

Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev

parents acb570cd 2b7ff726

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

+2 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ public class ActionBarContainer extends FrameLayout { 
                continue;

            }

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

            nonTabMaxHeight = isCollapsed(child) ? 0 :

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

            nonTabMaxHeight = Math.max(nonTabMaxHeight, isCollapsed(child) ? 0 :

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

        }



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