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

am: eb9c76efab Change-Id: I338d0b1e7ad9c3855cca05d9168db7fc6b139fb9
2019-08-09 11:49:41 -07:00
parent 2615c684b1 eb9c76efab
commit 4afc936882
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