Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lyn Han
2022-01-29 01:19:47 +00:00
committed by Android (Google) Code Review
parent 7a7271ddea 96941fa4b1
commit db5c3e9127
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

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

@@ -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;
}