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

Commit c4628334 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix translation direction in QS animation" into oc-dr1-dev 

am: feb5dc3b

Change-Id: I1c96516294b275eedcd543958ecbd45bad014a59
parents d96c9134 feb5dc3b

packages/SystemUI/src/com/android/systemui/qs/QSFooter.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -173,8 +173,9 @@ public class QSFooter extends FrameLayout implements 
                .addFloat(mSettingsButton, "rotation", -120, 0)

                .addFloat(mSettingsButton, "rotation", -120, 0)

                .build();

                .build();

        if (mAlarmShowing) {

        if (mAlarmShowing) {

            int translate = isLayoutRtl() ? mDate.getWidth() : -mDate.getWidth();

            mAlarmAnimator = new Builder().addFloat(mDate, "alpha", 1, 0)

            mAlarmAnimator = new Builder().addFloat(mDate, "alpha", 1, 0)

                    .addFloat(mDateTimeGroup, "translationX", 0, -mDate.getWidth())

                    .addFloat(mDateTimeGroup, "translationX", 0, translate)

                    .addFloat(mAlarmStatus, "alpha", 0, 1)

                    .addFloat(mAlarmStatus, "alpha", 0, 1)

                    .setListener(new ListenerAdapter() {

                    .setListener(new ListenerAdapter() {

                        @Override

                        @Override