diff options
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarContainer.java | 4 |
1 files 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) { |