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

Commit 28efba38 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Make Switch widget aware of layout direction 

- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I40e77e54ccee2e596ebc4649871debfd35ed95fa
parent c1da6518

core/java/android/widget/Switch.java

+42 −6
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ public class Switch extends CompoundButton { 
            mVelocityTracker.computeCurrentVelocity(1000);

            float xvel = mVelocityTracker.getXVelocity();

            if (Math.abs(xvel) > mMinFlingVelocity) {

                newState = xvel > 0;

                newState = isLayoutRtl() ? (xvel < 0) : (xvel > 0);

            } else {

                newState = getTargetCheckedState();

            }
@@ -669,13 +669,25 @@ public class Switch extends CompoundButton { 
    }



    private boolean getTargetCheckedState() {

        if (isLayoutRtl()) {

            return mThumbPosition <= getThumbScrollRange() / 2;

        } else {

            return mThumbPosition >= getThumbScrollRange() / 2;

        }

    }



    private void setThumbPosition(boolean checked) {

        if (isLayoutRtl()) {

            mThumbPosition = checked ? 0 : getThumbScrollRange();

        } else {

            mThumbPosition = checked ? getThumbScrollRange() : 0;

        }

    }



    @Override

    public void setChecked(boolean checked) {

        super.setChecked(checked);

        mThumbPosition = checked ? getThumbScrollRange() : 0;

        setThumbPosition(checked);

        invalidate();

    }
@@ -683,10 +695,19 @@ public class Switch extends CompoundButton { 
    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        super.onLayout(changed, left, top, right, bottom);



        mThumbPosition = isChecked() ? getThumbScrollRange() : 0;

        setThumbPosition(isChecked());



        int switchRight;

        int switchLeft;



        if (isLayoutRtl()) {

            switchLeft = getPaddingLeft();

            switchRight = switchLeft + mSwitchWidth;

        } else {

            switchRight = getWidth() - getPaddingRight();

            switchLeft = switchRight - mSwitchWidth;

        }



        int switchRight = getWidth() - getPaddingRight();

        int switchLeft = switchRight - mSwitchWidth;

        int switchTop = 0;

        int switchBottom = 0;

        switch (getGravity() & Gravity.VERTICAL_GRAVITY_MASK) {
@@ -760,8 +781,23 @@ public class Switch extends CompoundButton { 
        canvas.restore();

    }



    @Override

    public int getCompoundPaddingLeft() {

        if (!isLayoutRtl()) {

            return super.getCompoundPaddingLeft();

        }

        int padding = super.getCompoundPaddingLeft() + mSwitchWidth;

        if (!TextUtils.isEmpty(getText())) {

            padding += mSwitchPadding;

        }

        return padding;

    }



    @Override

    public int getCompoundPaddingRight() {

        if (isLayoutRtl()) {

            return super.getCompoundPaddingRight();

        }

        int padding = super.getCompoundPaddingRight() + mSwitchWidth;

        if (!TextUtils.isEmpty(getText())) {

            padding += mSwitchPadding;