diff options
| author | 2014-06-10 21:22:41 +0000 | |
|---|---|---|
| committer | 2014-06-10 21:22:41 +0000 | |
| commit | 6ab89e28cdcddad524ad6ce6036c2a2743db7d23 (patch) | |
| tree | f058c8bb41ff83ef66977f601332bfb62251019a | |
| parent | eb29d330c31e677b6beba7a88955b52b7ca5f39b (diff) | |
| parent | f8f524c80c92df22aa8b280152dd94968dffbb89 (diff) | |
Merge "Saver: Shared resource update and new settings." into lmp-preview-dev
| -rw-r--r-- | core/java/android/provider/Settings.java | 15 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 6 |
2 files changed, 18 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e9ffc5226fb3..bd988a6f5e60 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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 /** @@ -6018,6 +6027,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 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 865d92a8f37e..59d01dea40d4 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -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> |