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

Commit baaa33a3 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am d41d4586: am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when... 

am d41d4586: am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo

Merge commit 'd41d4586' into kraken

* commit 'd41d4586':
  Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
parents b7819f74 d41d4586

core/java/com/android/internal/widget/SlidingTab.java

+6 −1
Original line number Diff line number Diff line
@@ -476,7 +476,9 @@ public class SlidingTab extends ViewGroup { 
        int heightSpecSize =  MeasureSpec.getSize(heightMeasureSpec);



        if (widthSpecMode == MeasureSpec.UNSPECIFIED || heightSpecMode == MeasureSpec.UNSPECIFIED) {

            throw new RuntimeException(LOG_TAG + " cannot have UNSPECIFIED dimensions");

            Log.e("SlidingTab", "SlidingTab cannot have UNSPECIFIED MeasureSpec"

                    +"(wspec=" + widthSpecMode + ", hspec=" + heightSpecMode + ")",

                    new RuntimeException(LOG_TAG + "stack:"));

        }



        mLeftSlider.measure();
@@ -554,6 +556,9 @@ public class SlidingTab extends ViewGroup { 
    public void reset(boolean animate) {

        mLeftSlider.reset(animate);

        mRightSlider.reset(animate);

        if (!animate) {

            mAnimating = false;

        }

    }



    @Override