Merge "Fade from black when reach" into qt-r1-dev am: 331cdb72e6

am: f81411592b Change-Id: I93d665cab8dab34c31371fba1e75ec6d4a4b0bd1
2019-08-09 11:12:21 -07:00
parent 4b8e02d15b f81411592b
commit c442f90205
1 changed files with 6 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
@@ -133,6 +133,12 @@ public enum ScrimState {
            mBlankScreen = mDisplayRequiresBlanking;
            mAnimationDuration = mWakeLockScreenSensorActive
                    ? 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