Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d9ba800 authored by Matthew Duggan's avatar Matthew Duggan Committed by Android (Google) Code Review
Browse files

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

parents 642e4c0b 0ea9de1c

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -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.

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

services/core/java/com/android/server/display/DisplayPowerController.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/display/DisplayPowerController2.java

+3 −1
Original line number Diff line number Diff line
@@ -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);