diff options
| author | Adam Powell <adamp@google.com> | 2014-08-22 13:57:43 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2014-08-22 13:57:43 -0700 |
| commit | 2b7ff72683b71e87c327eb781dfbcc5d6fb5c9f9 (patch) | |
| tree | 3518e61f0820204542359dbf781301bcf6505332 /core | |
| parent | a12aaa75df2a7611f38050e2111a767a20a91b1b (diff) | |
| download | frameworks_base-2b7ff72683b71e87c327eb781dfbcc5d6fb5c9f9.zip frameworks_base-2b7ff72683b71e87c327eb781dfbcc5d6fb5c9f9.tar.gz frameworks_base-2b7ff72683b71e87c327eb781dfbcc5d6fb5c9f9.tar.bz2 | |
Fix (another) measurement issue in ActionBarContainer
Or, the patch in which we discover how many silly bugs adamp caused in
e77b6590.
Change-Id: Iaacd3792d161e068dee74b897872e9ab2f155aca
Diffstat (limited to 'core')
| -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) { |