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

Commit 01acbe97 authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge branch 'Html6405:v1-pie' into 'v1-pie' 

DisplayPowerController: Make colorfade configurable via overlay.

See merge request e/os/android_frameworks_base!105
parents 39e446e0 38e63c99

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -735,6 +735,9 @@ 
    <!-- If this is true, the screen will fade off. -->

    <bool name="config_animateScreenLights">false</bool>



    <!-- If this is true, colorfade will be enabled. -->

    <bool name="config_colorFade_enabled">true</bool>



    <!-- If this is true, key chords can be used to take a screenshot on the device. -->

    <bool name="config_enableScreenshotChord">true</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1861,6 +1861,7 @@ 
  <java-symbol type="array" name="config_notificationFallbackVibePattern" />

  <java-symbol type="bool" name="config_useAttentionLight" />

  <java-symbol type="bool" name="config_animateScreenLights" />

  <java-symbol type="bool" name="config_colorFade_enabled" />

  <java-symbol type="bool" name="config_automatic_brightness_available" />

  <java-symbol type="bool" name="config_smart_battery_available" />

  <java-symbol type="bool" name="config_autoBrightnessResetAmbientLuxAfterWarmUp" />

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

+2 −1
Original line number Diff line number Diff line
@@ -482,7 +482,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            }

        }



        mColorFadeEnabled = !ActivityManager.isLowRamDeviceStatic();

        mColorFadeEnabled = resources.getBoolean(

                com.android.internal.R.bool.config_colorFade_enabled) && !ActivityManager.isLowRamDeviceStatic();

        mColorFadeFadesConfig = resources.getBoolean(

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