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

Commit 9e295bf2 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Fix Quick Settings tiles jerking down while animating to notifications view" into cm-11.0

parents 2903f915 f193a3c3

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+14 −1
Original line number Diff line number Diff line
@@ -1652,6 +1652,17 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        return a;

    }



    public Animator setVisibilityOnStart(

            final Animator a, final View v, final int vis) {

        a.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationStart(Animator animation) {

                v.setVisibility(vis);

            }

        });

        return a;

    }



    public Animator interpolator(TimeInterpolator ti, Animator a) {

        a.setInterpolator(ti);

        return a;
@@ -1717,9 +1728,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        if (mRibbonView != null && mHasQuickAccessSettings) {

            mRibbonViewAnim = start(

                startDelay(FLIP_DURATION_OUT * zeroOutDelays,

                    setVisibilityOnStart(

                        interpolator(mDecelerateInterpolator,

                            ObjectAnimator.ofFloat(mRibbonView, View.SCALE_X, 1f)

                                .setDuration(FLIP_DURATION_IN))));

                                .setDuration(FLIP_DURATION_IN)),

                        mRibbonView, View.VISIBLE)));

        }

        mFlipSettingsViewAnim = start(

            setVisibilityWhenDone(