From a12aaa75df2a7611f38050e2111a767a20a91b1b Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Fri, 22 Aug 2014 10:46:55 -0700
Subject: [PATCH] Add a missing condition when checking measurement for
 ActionBarContainer

It even said "non-tab" right there.

Bug 17202141

Change-Id: Iacc7ec9610d2639aab59dd57ba7194178fb6391f
---
 core/java/com/android/internal/widget/ActionBarContainer.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/com/android/internal/widget/ActionBarContainer.java b/core/java/com/android/internal/widget/ActionBarContainer.java
index a2b8ff21dadad..9b261ac11cce3 100644
--- a/core/java/com/android/internal/widget/ActionBarContainer.java
+++ b/core/java/com/android/internal/widget/ActionBarContainer.java
@@ -272,6 +272,9 @@ public class ActionBarContainer extends FrameLayout {
         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;