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

Commit ed223c1d authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Make tablet layout RTL compatible" into udc-dev am: a997b80a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23477481



Change-Id: I77e36169201148340957f96d4561173c8c5aeb64
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12caf4b6 a997b80a

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

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

                constraintSet.constrainHeight(mViewFlipper.getId(), MATCH_CONSTRAINT);

                constraintSet.applyTo(mView);

                constraintSet.applyTo(mView);

            } else {

            } else {

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

                int startElement =

                int rightElement =

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

                int endElement =

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

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





                ConstraintSet constraintSet = new ConstraintSet();

                ConstraintSet constraintSet = new ConstraintSet();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

                getViewConstraint(mSecurityViewFlipper.getId());

        ConstraintSet.Constraint userSwitcherConstraint =

        ConstraintSet.Constraint userSwitcherConstraint =

                getViewConstraint(R.id.keyguard_bouncer_user_switcher);

                getViewConstraint(R.id.keyguard_bouncer_user_switcher);

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

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

        assertThat(viewFlipperConstraint.layout.leftToRight).isEqualTo(

        assertThat(viewFlipperConstraint.layout.startToEnd).isEqualTo(

                R.id.keyguard_bouncer_user_switcher);

                R.id.keyguard_bouncer_user_switcher);

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

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

        assertThat(userSwitcherConstraint.layout.rightToLeft).isEqualTo(

        assertThat(userSwitcherConstraint.layout.endToStart).isEqualTo(

                mSecurityViewFlipper.getId());

                mSecurityViewFlipper.getId());

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

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

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

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




        ConstraintSet.Constraint viewFlipperConstraint = getViewConstraint(

        ConstraintSet.Constraint viewFlipperConstraint = getViewConstraint(

                mSecurityViewFlipper.getId());

                mSecurityViewFlipper.getId());

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

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

    }

    }





    @Test

    @Test