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

Commit a7bb0307 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of e30e3430 to oc-mr1-dev-plus-aosp am: 6dadd3e4"

parents b86129e4 ca41e8f1

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

+2 −1
Original line number 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);



        mAnimator = new Builder()

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

                .addFloat(mSettingsContainer, "translationX",

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

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

                .build();

        if (mAlarmShowing) {