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

Commit 7cac0e1f authored by Aaron Liu's avatar Aaron Liu
Browse files

Make tablet layout RTL compatible 

Use start and end constraints instead of right and left to make it RTL
compatible.

Fixes: 284839799
Test: Force RTL layout and open bouncer on tablet.
Change-Id: I62b107430f7fce5bb4d130f2c3b8c68654c94c73
parent d2c9a9e7

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+7 −6
Original line number Diff line number Diff line
@@ -1226,15 +1226,16 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
                constraintSet.constrainHeight(mViewFlipper.getId(), MATCH_CONSTRAINT);

                constraintSet.applyTo(mView);

            } else {

                int leftElement = leftAlign ? mViewFlipper.getId() : mUserSwitcherViewGroup.getId();

                int rightElement =

                int startElement =

                        leftAlign ? mViewFlipper.getId() : mUserSwitcherViewGroup.getId();

                int endElement =

                        leftAlign ? mUserSwitcherViewGroup.getId() : mViewFlipper.getId();



                ConstraintSet constraintSet = new ConstraintSet();

                constraintSet.connect(leftElement, LEFT, PARENT_ID, LEFT);

                constraintSet.connect(leftElement, RIGHT, rightElement, LEFT);

                constraintSet.connect(rightElement, LEFT, leftElement, RIGHT);

                constraintSet.connect(rightElement, RIGHT, PARENT_ID, RIGHT);

                constraintSet.connect(startElement, START, PARENT_ID, START);

                constraintSet.connect(startElement, END, endElement, START);

                constraintSet.connect(endElement, START, startElement, END);

                constraintSet.connect(endElement, END, PARENT_ID, END);

                constraintSet.connect(mUserSwitcherViewGroup.getId(), TOP, PARENT_ID, TOP);

                constraintSet.connect(mUserSwitcherViewGroup.getId(), BOTTOM, PARENT_ID, BOTTOM);

                constraintSet.connect(mViewFlipper.getId(), TOP, PARENT_ID, TOP);

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java

+5 −5
Original line number Diff line number Diff line
@@ -253,11 +253,11 @@ public class KeyguardSecurityContainerTest extends SysuiTestCase { 
                getViewConstraint(mSecurityViewFlipper.getId());

        ConstraintSet.Constraint userSwitcherConstraint =

                getViewConstraint(R.id.keyguard_bouncer_user_switcher);

        assertThat(viewFlipperConstraint.layout.rightToRight).isEqualTo(PARENT_ID);

        assertThat(viewFlipperConstraint.layout.leftToRight).isEqualTo(

        assertThat(viewFlipperConstraint.layout.endToEnd).isEqualTo(PARENT_ID);

        assertThat(viewFlipperConstraint.layout.startToEnd).isEqualTo(

                R.id.keyguard_bouncer_user_switcher);

        assertThat(userSwitcherConstraint.layout.leftToLeft).isEqualTo(PARENT_ID);

        assertThat(userSwitcherConstraint.layout.rightToLeft).isEqualTo(

        assertThat(userSwitcherConstraint.layout.startToStart).isEqualTo(PARENT_ID);

        assertThat(userSwitcherConstraint.layout.endToStart).isEqualTo(

                mSecurityViewFlipper.getId());

        assertThat(viewFlipperConstraint.layout.topToTop).isEqualTo(PARENT_ID);

        assertThat(viewFlipperConstraint.layout.bottomToBottom).isEqualTo(PARENT_ID);
@@ -377,7 +377,7 @@ public class KeyguardSecurityContainerTest extends SysuiTestCase { 


        ConstraintSet.Constraint viewFlipperConstraint = getViewConstraint(

                mSecurityViewFlipper.getId());

        assertThat(viewFlipperConstraint.layout.leftToLeft).isEqualTo(PARENT_ID);

        assertThat(viewFlipperConstraint.layout.startToStart).isEqualTo(PARENT_ID);

    }



    @Test