diff options
| author | Adam Powell <adamp@google.com> | 2014-08-22 21:20:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-22 21:20:24 +0000 |
| commit | c9991c7149ccd320200ad62ac0036fe57c5cc831 (patch) | |
| tree | ad84d995099f64943e77e1edbabdb7cabac50115 /core/java | |
| parent | acb570cd84b4e3503e7e96138ea0d9d236ca9b9e (diff) | |
| parent | 2b7ff72683b71e87c327eb781dfbcc5d6fb5c9f9 (diff) | |
| download | frameworks_base-c9991c7149ccd320200ad62ac0036fe57c5cc831.zip frameworks_base-c9991c7149ccd320200ad62ac0036fe57c5cc831.tar.gz frameworks_base-c9991c7149ccd320200ad62ac0036fe57c5cc831.tar.bz2 | |
Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev
Diffstat (limited to 'core/java')
| -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) { |