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

Commit a26ddfac authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Remove dead code in Switch"

parents a061ef6c 8dbf3b00

core/java/android/widget/Switch.java

+0 −34
Original line number Diff line number Diff line
@@ -469,12 +469,6 @@ public class Switch extends CompoundButton { 


    @Override

    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);

        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);

        int widthSize = MeasureSpec.getSize(widthMeasureSpec);

        int heightSize = MeasureSpec.getSize(heightMeasureSpec);





        if (mOnLayout == null) {

            mOnLayout = makeLayout(mTextOn);

        }
@@ -490,34 +484,6 @@ public class Switch extends CompoundButton { 


        mThumbWidth = maxTextWidth + mThumbTextPadding * 2;



        switch (widthMode) {

            case MeasureSpec.AT_MOST:

                widthSize = Math.min(widthSize, switchWidth);

                break;



            case MeasureSpec.UNSPECIFIED:

                widthSize = switchWidth;

                break;



            case MeasureSpec.EXACTLY:

                // Just use what we were given

                break;

        }



        switch (heightMode) {

            case MeasureSpec.AT_MOST:

                heightSize = Math.min(heightSize, switchHeight);

                break;



            case MeasureSpec.UNSPECIFIED:

                heightSize = switchHeight;

                break;



            case MeasureSpec.EXACTLY:

                // Just use what we were given

                break;

        }



        mSwitchWidth = switchWidth;

        mSwitchHeight = switchHeight;