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

Commit 72b6c8de 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 main

parents 526b73c3 5979e99d

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2705,6 +2705,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
@@ -3867,6 +3867,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
@@ -722,7 +722,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

+5 −3
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 


        setUpAutoBrightness(resources, handler);



        mColorFadeEnabled = mInjector.isColorFadeEnabled();

        mColorFadeEnabled = mInjector.isColorFadeEnabled(resources);

        mColorFadeFadesConfig = resources.getBoolean(

                R.bool.config_animateScreenLights);
@@ -3005,8 +3005,10 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                    sensorManager, resources);

        }



        boolean isColorFadeEnabled() {

            return !ActivityManager.isLowRamDeviceStatic();

        boolean isColorFadeEnabled(Resources resources) {

            return !ActivityManager.isLowRamDeviceStatic()

                && !resources.getBoolean(

                  com.android.internal.R.bool.config_displayColorFadeDisabled);

        }

    }