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

Commit d038666f authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 58b243c3: Merge "Saver: Shared resource update and new settings." into lmp-preview-dev 

* commit '58b243c37e74d45129071ac55128c16160e6fac8':
  Saver: Shared resource update and new settings.
parents 1b8aef2b 6ab89e28

core/java/android/provider/Settings.java

+15 −0
Original line number Diff line number Diff line
@@ -791,6 +791,15 @@ public final class Settings { 
    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_PAIRING_SETTINGS = "android.settings.PAIRING_SETTINGS";



    /**

     * Activity Action: Show battery saver settings.

     *

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_BATTERY_SAVER_SETTINGS

            = "android.settings.BATTERY_SAVER_SETTINGS";



    // End of Intent actions for Settings



    /**
@@ -6024,6 +6033,12 @@ public final class Settings { 
         */

        public static final String LOW_POWER_MODE = "low_power";



        /**

         * Battery level [1-99] at which low power mode automatically turns on.

         * @hide

         */

        public static final String LOW_POWER_MODE_TRIGGER_LEVEL = "low_power_trigger_level";



         /**

         * If 1, the activity manager will aggressively finish activities and

         * processes as soon as they are no longer needed.  If 0, the normal

core/res/res/values/config.xml

+3 −3
Original line number Diff line number Diff line
@@ -589,16 +589,16 @@ 


    <!-- Display low battery warning when battery level dips to this value.

         Also, the battery stats are flushed to disk when we hit this level.  -->

    <integer name="config_criticalBatteryWarningLevel">4</integer>

    <integer name="config_criticalBatteryWarningLevel">5</integer>



    <!-- Shutdown if the battery temperature exceeds (this value * 0.1) Celsius. -->

    <integer name="config_shutdownBatteryTemperature">680</integer>



    <!-- Display low battery warning when battery level dips to this value -->

    <integer name="config_lowBatteryWarningLevel">15</integer>

    <integer name="config_lowBatteryWarningLevel">20</integer>



    <!-- Close low battery warning when battery level reaches this value -->

    <integer name="config_lowBatteryCloseWarningLevel">20</integer>

    <integer name="config_lowBatteryCloseWarningLevel">25</integer>



    <!-- Default color for notification LED. -->

    <color name="config_defaultNotificationColor">#ffffffff</color>