Merge "Add a Settings value to store extra battery saver state" into udc-dev (c4a37b60) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -10777,6 +10777,15 @@ public final class Settings {
		public static final String LOW_POWER_WARNING_ACKNOWLEDGED =
		"low_power_warning_acknowledged";

		/**
		* Whether the "first time extra battery saver warning" dialog needs to be shown
		* (0: default) or not (1).
		*
		* @hide
		*/
		public static final String EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED =
		"extra_low_power_warning_acknowledged";

		/**
		* 0 (default) Auto battery saver suggestion has not been suppressed. 1) it has been
		* suppressed.
		@@ -15192,6 +15201,12 @@ public final class Settings {
		@Readable
		public static final String LOW_POWER_MODE = "low_power";

		/**
		* If 1 extra low power mode is enabled.
		* @hide
		*/
		public static final String EXTRA_LOW_POWER_MODE = "extra_low_power";

		/**
		* If 1, battery saver ({@link #LOW_POWER_MODE}) will be re-activated after the device
		* is unplugged from a charger or rebooted.

+2 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,8 @@ public class SecureSettings {
		Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION,
		Settings.Secure.VOLUME_HUSH_GESTURE,
		Settings.Secure.MANUAL_RINGER_TOGGLE_COUNT,
		Settings.Secure.LOW_POWER_WARNING_ACKNOWLEDGED,
		Settings.Secure.EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED,
		Settings.Secure.HUSH_GESTURE_USED,
		Settings.Secure.IN_CALL_NOTIFICATION_ENABLED,
		Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,

+2 −0

Original line number	Diff line number	Diff line
		@@ -219,6 +219,8 @@ public class SecureSettingsValidators {
		COLON_SEPARATED_PACKAGE_LIST_VALIDATOR); // legacy restore setting
		VALIDATORS.put(Secure.HUSH_GESTURE_USED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.MANUAL_RINGER_TOGGLE_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(Secure.LOW_POWER_WARNING_ACKNOWLEDGED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.IN_CALL_NOTIFICATION_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, BOOLEAN_VALIDATOR);

+1 −1

Original line number	Diff line number	Diff line
		@@ -322,6 +322,7 @@ public class SettingsBackupTest {
		Settings.Global.LOW_BATTERY_SOUND,
		Settings.Global.LOW_BATTERY_SOUND_TIMEOUT,
		Settings.Global.LOW_POWER_MODE,
		Settings.Global.EXTRA_LOW_POWER_MODE,
		Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL_MAX,
		Settings.Global.LOW_POWER_MODE_STICKY,
		Settings.Global.LOW_POWER_MODE_SUGGESTION_PARAMS,
		@@ -800,7 +801,6 @@ public class SettingsBackupTest {
		Settings.Secure.PARENTAL_CONTROL_REDIRECT_URL,
		Settings.Secure.BLUETOOTH_ON_WHILE_DRIVING,
		Settings.Secure.LOW_POWER_MANUAL_ACTIVATION_COUNT,
		Settings.Secure.LOW_POWER_WARNING_ACKNOWLEDGED,
		Settings.Secure.SUPPRESS_AUTO_BATTERY_SAVER_SUGGESTION,
		Settings.Secure.PACKAGES_TO_CLEAR_DATA_BEFORE_FULL_RESTORE,
		Settings.Secure.FLASHLIGHT_AVAILABLE,