summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/widget/ActionBarContainer.java3
1 files changed, 3 insertions, 0 deletions
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 @@ 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;