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

Commit 18e2c4c5 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Use correct alpha interpolator for notification animation. 

Bug: 181654098
Test: Tap a notification
Change-Id: I4e75a6f5c89170e95cd6c93cd80611e22b0b4127
parent 229a149a

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ class ActivityLaunchAnimator(context: Context) { 
                ANIMATION_DURATION - ANIMATION_DURATION_NAV_FADE_IN

                ANIMATION_DURATION - ANIMATION_DURATION_NAV_FADE_IN

        private const val LAUNCH_TIMEOUT = 1000L

        private const val LAUNCH_TIMEOUT = 1000L





        private val CONTENT_FADE_OUT_INTERPOLATOR = PathInterpolator(0f, 0f, 0.2f, 1f)

        @JvmField val CONTENT_FADE_OUT_INTERPOLATOR = PathInterpolator(0f, 0f, 0.2f, 1f)

        private val WINDOW_FADE_IN_INTERPOLATOR = PathInterpolator(0f, 0f, 0.6f, 1f)

        private val WINDOW_FADE_IN_INTERPOLATOR = PathInterpolator(0f, 0f, 0.6f, 1f)

        private val NAV_FADE_IN_INTERPOLATOR = PathInterpolator(0f, 0f, 0f, 1f)

        private val NAV_FADE_IN_INTERPOLATOR = PathInterpolator(0f, 0f, 0f, 1f)

        private val NAV_FADE_OUT_INTERPOLATOR = PathInterpolator(0.2f, 0f, 1f, 1f)

        private val NAV_FADE_OUT_INTERPOLATOR = PathInterpolator(0.2f, 0f, 1f, 1f)

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2085,7 +2085,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            contentView.animate()

            contentView.animate()

                    .alpha(0f)

                    .alpha(0f)

                    .setDuration(ActivityLaunchAnimator.ANIMATION_DURATION_FADE_OUT_CONTENT)

                    .setDuration(ActivityLaunchAnimator.ANIMATION_DURATION_FADE_OUT_CONTENT)

                    .setInterpolator(Interpolators.ALPHA_OUT);

                    .setInterpolator(ActivityLaunchAnimator.CONTENT_FADE_OUT_INTERPOLATOR);

            setAboveShelf(true);

            setAboveShelf(true);

            mExpandAnimationRunning = true;

            mExpandAnimationRunning = true;

            getViewState().cancelAnimations(this);

            getViewState().cancelAnimations(this);