Merge "Scrollable tabs are correctly displayed."

1 files changed, 6 insertions, 3 deletions

diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java
index d74ef245e5f7..6f76dd0d2b75 100644
--- a/core/java/android/widget/TabWidget.java
+++ b/core/java/android/widget/TabWidget.java
@@ -172,6 +172,11 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener {
 
     @Override
     void measureHorizontal(int widthMeasureSpec, int heightMeasureSpec) {
+        if (MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.UNSPECIFIED) {
+            super.measureHorizontal(widthMeasureSpec, heightMeasureSpec);
+            return;
+        }
+
         // First, measure with no constraint
         final int unspecifiedWidth = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
         mImposedTabsHeight = -1;
@@ -208,9 +213,7 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener {
         }
 
         // Measure again, this time with imposed tab widths and respecting initial spec request
-        if (mImposedTabsHeight >= 0 || unspecifiedWidth != widthMeasureSpec) {
-            super.measureHorizontal(widthMeasureSpec, heightMeasureSpec);
-        }
+        super.measureHorizontal(widthMeasureSpec, heightMeasureSpec);
     }
 
     /**