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

Commit 6dadd3e4 authored by Jason Monk's avatar Jason Monk
Browse files

resolve merge conflicts of e30e3430 to oc-mr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9d1a10dbad49680a25a64a7a6b3eadca91f9bc7d
parents b23b60e5 e30e3430

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -157,7 +157,8 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, 
        int defSpace = mContext.getResources().getDimensionPixelOffset(R.dimen.default_gear_space);

        int defSpace = mContext.getResources().getDimensionPixelOffset(R.dimen.default_gear_space);





        mAnimator = new Builder()

        mAnimator = new Builder()

                .addFloat(mSettingsContainer, "translationX", -(remaining - defSpace), 0)

                .addFloat(mSettingsContainer, "translationX",

                        isLayoutRtl() ? (remaining - defSpace) : -(remaining - defSpace), 0)

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

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

                .build();

                .build();

        if (mAlarmShowing) {

        if (mAlarmShowing) {