Allow separate configuration of display color fade Previously color fade before display power-off was disabled for devices with a low-RAM configuration. Some devices may not want this animation even though they have a plenty of RAM, so allow it to be controlled separately. Bug: 284838712 Change-Id: I2369d10c293d7b05d55878a28f702a81428ddd15 Merged-In: I2369d10c293d7b05d55878a28f702a81428ddd15 Test: atest DisplayPowerControllerTest Test: atest DisplayPowerController2Test
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 2d8bfbb..08e3983 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml
@@ -2683,6 +2683,9 @@ backlight values --> <bool name="config_displayBrightnessBucketsInDoze">false</bool> + <!-- True to skip the fade animation on display off event --> + <bool name="config_displayColorFadeDisabled">false</bool> + <!-- Power Management: Specifies whether to decouple the auto-suspend state of the device from the display on/off state.
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 59306a3..971e224 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml
@@ -3852,6 +3852,7 @@ <java-symbol type="bool" name="config_dozeSupportsAodWallpaper" /> <java-symbol type="bool" name="config_displayBlanksAfterDoze" /> <java-symbol type="bool" name="config_displayBrightnessBucketsInDoze" /> + <java-symbol type="bool" name="config_displayColorFadeDisabled" /> <java-symbol type="integer" name="config_storageManagerDaystoRetainDefault" /> <java-symbol type="string" name="config_headlineFontFamily" /> <java-symbol type="string" name="config_headlineFontFamilyMedium" />
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index ffecf2b..a231d58 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -718,7 +718,9 @@ setUpAutoBrightness(resources, handler); - mColorFadeEnabled = !ActivityManager.isLowRamDeviceStatic(); + mColorFadeEnabled = !ActivityManager.isLowRamDeviceStatic() + && !resources.getBoolean( + com.android.internal.R.bool.config_displayColorFadeDisabled); mColorFadeFadesConfig = resources.getBoolean( com.android.internal.R.bool.config_animateScreenLights);
diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java index 7417aeb..2d4d44f 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController2.java +++ b/services/core/java/com/android/server/display/DisplayPowerController2.java
@@ -610,7 +610,9 @@ setUpAutoBrightness(resources, handler); - mColorFadeEnabled = mInjector.isColorFadeEnabled(); + mColorFadeEnabled = mInjector.isColorFadeEnabled() + && !resources.getBoolean( + com.android.internal.R.bool.config_displayColorFadeDisabled); mColorFadeFadesConfig = resources.getBoolean( R.bool.config_animateScreenLights);