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

Commit 22ef7b63 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Renamed config_dozeAfterScreenOff" into pi-dev 

am: 425812c8

Change-Id: Idbcdb70caeddd08db6246ea79d554aa8fb65bf54
parents f83c6639 425812c8

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -1996,7 +1996,7 @@ 


    <!-- If true, the doze component is not started until after the screen has been

         turned off and the screen off animation has been performed. -->

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

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



    <!-- Doze: should the TYPE_PICK_UP_GESTURE sensor be used as a pulse signal. -->

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

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -1817,7 +1817,7 @@ 
  <java-symbol type="bool" name="config_notificationHeaderClickableForExpand" />

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

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

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

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

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

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

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

services/core/java/com/android/server/power/PowerManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ public final class PowerManagerService extends SystemService 
        mDreamsBatteryLevelDrainCutoffConfig = resources.getInteger(

                com.android.internal.R.integer.config_dreamsBatteryLevelDrainCutoff);

        mDozeAfterScreenOff = resources.getBoolean(

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

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

        mMinimumScreenOffTimeoutConfig = resources.getInteger(

                com.android.internal.R.integer.config_minimumScreenOffTimeout);

        mMaximumScreenDimDurationConfig = resources.getInteger(