Merge "DO NOT MERGE Cherry-pick of cd59febcea from master" into honeycomb

2011-03-01 17:50:51 -08:00
parent df33b8c51d 4797f020cd
commit ef7aed89b6
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/TabWidget.java
+++ b/core/java/android/widget/TabWidget.java
@@ -174,8 +174,8 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener {
    void measureHorizontal(int widthMeasureSpec, int heightMeasureSpec) {
        // First, measure with no constraint
        final int unspecifiedWidth = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
-        super.measureHorizontal(unspecifiedWidth, heightMeasureSpec);
        mImposedTabsHeight = -1;
+        super.measureHorizontal(unspecifiedWidth, heightMeasureSpec);

        int extraWidth = getMeasuredWidth() - MeasureSpec.getSize(widthMeasureSpec);
        if (extraWidth > 0) {