commit c793c9eb2422936cab70ff310937baf0ae551e02
author Adam Powell <adamp@google.com> Fri Aug 22 18:03:19 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 22 18:03:20 2014 +0000
tree 214121613b2d541008a5bad448d8f44bbf7ee802
parent 931b2e7c3a0133929f72e729e4ed8edf2b55c15e
parent a12aaa75df2a7611f38050e2111a767a20a91b1b

Merge "Add a missing condition when checking measurement for 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 a2b8ff2..9b261ac 100644
--- a/core/java/com/android/internal/widget/ActionBarContainer.java
+++ b/core/java/com/android/internal/widget/ActionBarContainer.java
@@ -272,6 +272,9 @@
         final int childCount = getChildCount();
         for (int i = 0; i < childCount; i++) {
             final View child = getChildAt(i);
+            if (child == mTabContainer) {
+                continue;
+            }
             final LayoutParams lp = (LayoutParams) child.getLayoutParams();
             nonTabMaxHeight = isCollapsed(child) ? 0 :
                     child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin;