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

Commit 2fce3c8c authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed that the shelf was animating the icons 

When expanding instantly, the shelf was still animating
it's icons which shouldn't happen.

Change-Id: I76ceb4cc77a1830e555499fff9ce8b94c77b0bfe
Fixes: 37918141
parent f323e3a5

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) {
@@ -365,7 +367,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
@@ -503,6 +506,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;