commit c9991c7149ccd320200ad62ac0036fe57c5cc831
author Adam Powell <adamp@google.com> Fri Aug 22 21:20:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 22 21:20:24 2014 +0000
tree ad84d995099f64943e77e1edbabdb7cabac50115
parent acb570cd84b4e3503e7e96138ea0d9d236ca9b9e
parent 2b7ff72683b71e87c327eb781dfbcc5d6fb5c9f9

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

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

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 @@
                 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) {