Merge "Fade from black when reach" into qt-r1-dev

am: 331cdb72e6

Change-Id: I94c39e651621b47e3bad580df1b0895e91cf1d42
This commit is contained in:
Lucas Dupin
2019-08-09 11:00:00 -07:00
committed by android-build-merger

View File

@@ -133,6 +133,12 @@ public enum ScrimState {
mBlankScreen = mDisplayRequiresBlanking; mBlankScreen = mDisplayRequiresBlanking;
mAnimationDuration = mWakeLockScreenSensorActive mAnimationDuration = mWakeLockScreenSensorActive
? ScrimController.ANIMATION_DURATION_LONG : ScrimController.ANIMATION_DURATION; ? ScrimController.ANIMATION_DURATION_LONG : ScrimController.ANIMATION_DURATION;
// Wake sensor will show the wallpaper, let's fade from black. Otherwise it will
// feel like the screen is flashing if the wallpaper is light.
if (mWakeLockScreenSensorActive && previousState == AOD) {
updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK);
}
} }
@Override @Override