Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow separate configuration of display color fade" into udc-qpr-dev

Browse Source
This commit is contained in:
Matthew Duggan
2023-07-26 01:05:16 +00:00
committed by Android (Google) Code Review
parent 642e4c0b55 0ea9de1cf9
commit 7d9ba80099
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
View File

@@ -2694,6 +2694,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.

1
core/res/res/values/symbols.xml
View File

@@ -3855,6 +3855,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" />

4
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -724,7 +724,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
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);

4
services/core/java/com/android/server/display/DisplayPowerController2.java
View File

@@ -611,7 +611,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
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);