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

Commit 613d0b2b authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed that the shelf was animating the icons" into oc-dev 

am: 214f4cff

Change-Id: I76dbc867f2d3222e77f6f5e2996021cce774bd52
parents 9a93b54d 214f4cff

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+6 −1
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ public class NotificationShelf extends ActivatableNotificationView implements 
    private float mMaxShelfEnd;

    private int mRelativeOffset;

    private boolean mInteractive;

    private float mOpenedAmount;

    private boolean mNoAnimationsInThisFrame;

    private boolean mAnimationsEnabled = true;



    public NotificationShelf(Context context, AttributeSet attrs) {
@@ -367,7 +369,8 @@ public class NotificationShelf extends ActivatableNotificationView implements 
        } else {

            // We take the clamped position instead

            transitionAmount = clampedAmount;

            iconState.needsCannedAnimation = iconState.clampedAppearAmount != clampedAmount;

            iconState.needsCannedAnimation = iconState.clampedAppearAmount != clampedAmount

                    && !mNoAnimationsInThisFrame;

        }

        iconState.iconAppearAmount = !USE_ANIMATIONS_WHEN_OPENING

                    || iconState.useFullTransitionAmount
@@ -505,6 +508,8 @@ public class NotificationShelf extends ActivatableNotificationView implements 
    }



    private void setOpenedAmount(float openedAmount) {

        mNoAnimationsInThisFrame = openedAmount == 1.0f && mOpenedAmount == 0.0f;

        mOpenedAmount = openedAmount;

        if (!mAmbientState.isPanelFullWidth()) {

            // We don't do a transformation at all, lets just assume we are fully opened

            openedAmount = 1.0f;