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

Commit 5cdd5d95 authored by Jason Monk's avatar Jason Monk
Browse files

resolve merge conflicts of 8e4204c8 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4a7f13b64648735148d345d91e93d84e03e309c3
parents 42c18fc2 8e4204c8

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

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

                .build();

        if (mAlarmShowing) {

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

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

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

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

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

                    .setListener(new ListenerAdapter() {

                        @Override