Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef7aed89 authored by Jason Chen's avatar Jason Chen Committed by Android (Google) Code Review
Browse files

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

parents df33b8c5 4797f020

core/java/android/widget/TabWidget.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {