From 2b7ff72683b71e87c327eb781dfbcc5d6fb5c9f9 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Fri, 22 Aug 2014 13:57:43 -0700 Subject: Fix (another) measurement issue in ActionBarContainer Or, the patch in which we discover how many silly bugs adamp caused in e77b6590. Change-Id: Iaacd3792d161e068dee74b897872e9ab2f155aca --- core/java/com/android/internal/widget/ActionBarContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/widget/ActionBarContainer.java b/core/java/com/android/internal/widget/ActionBarContainer.java index 9b261ac..8111e63 100644 --- a/core/java/com/android/internal/widget/ActionBarContainer.java +++ b/core/java/com/android/internal/widget/ActionBarContainer.java @@ -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) { -- cgit v1.1