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

Commit db5c3e91 authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Set wakeup light reveal duration to 667ms to match spec"

parents 7a7271dd 96941fa4

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackStateAnimator.java

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public class StackStateAnimator { 
    public static final int ANIMATION_DURATION_STANDARD = 360;

    public static final int ANIMATION_DURATION_CORNER_RADIUS = 200;

    public static final int ANIMATION_DURATION_WAKEUP = 500;

    public static final int ANIMATION_DURATION_WAKEUP_SCRIM = 667;

    public static final int ANIMATION_DURATION_GO_TO_FULL_SHADE = 448;

    public static final int ANIMATION_DURATION_APPEAR_DISAPPEAR = 464;

    public static final int ANIMATION_DURATION_SWIPE = 200;

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

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public enum ScrimState { 
        public void prepare(ScrimState previousState) {

            mBlankScreen = false;

            if (previousState == ScrimState.AOD) {

                mAnimationDuration = StackStateAnimator.ANIMATION_DURATION_WAKEUP;

                mAnimationDuration = StackStateAnimator.ANIMATION_DURATION_WAKEUP_SCRIM;

                if (mDisplayRequiresBlanking) {

                    // DisplayPowerManager will blank the screen, we'll just

                    // set our scrim to black in this frame to avoid flickering and
@@ -70,7 +70,7 @@ public enum ScrimState { 
                    mBlankScreen = true;

                }

            } else if (previousState == ScrimState.KEYGUARD) {

                mAnimationDuration = StackStateAnimator.ANIMATION_DURATION_WAKEUP;

                mAnimationDuration = StackStateAnimator.ANIMATION_DURATION_WAKEUP_SCRIM;

            } else {

                mAnimationDuration = ScrimController.ANIMATION_DURATION;

            }