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

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

Merge "Fixed a bug where the shelf could be stuck translating" into pi-dev am: aa7766b4 

am: a63f5cf2

Change-Id: I4a1a336813608ed90cb4ac347ace93f4dba3e0ae
parents 0502d90f a63f5cf2

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

+2 −3
Original line number Diff line number Diff line
@@ -154,12 +154,11 @@ public class NotificationShelf extends ActivatableNotificationView implements 
    }



    public void fadeInTranslating() {

        float translation = mShelfIcons.getTranslationY();

        mShelfIcons.setTranslationY(translation - mShelfAppearTranslation);

        mShelfIcons.setTranslationY(-mShelfAppearTranslation);

        mShelfIcons.setAlpha(0);

        mShelfIcons.animate()

                .setInterpolator(Interpolators.DECELERATE_QUINT)

                .translationY(translation)

                .translationY(0)

                .setDuration(SHELF_IN_TRANSLATION_DURATION)

                .start();

        mShelfIcons.animate()