Merge "Fade from black when reach" into qt-r1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
331cdb72e6
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user