Merge "Add ADAPTIVE_SLEEP setting" (1e84afba) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -3299,6 +3299,14 @@ public final class Settings {
		*/
		public static final int SCREEN_BRIGHTNESS_MODE_AUTOMATIC = 1;

		/**
		* Control whether to enable adaptive sleep mode.
		* @hide
		*/
		public static final String ADAPTIVE_SLEEP = "adaptive_sleep";

		private static final Validator ADAPTIVE_SLEEP_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Control whether the process CPU usage meter should be shown.
		*
		@@ -4232,6 +4240,7 @@ public final class Settings {
		SCREEN_BRIGHTNESS_MODE,
		SCREEN_AUTO_BRIGHTNESS_ADJ,
		SCREEN_BRIGHTNESS_FOR_VR,
		ADAPTIVE_SLEEP,
		VIBRATE_INPUT_DEVICES,
		MODE_RINGER_STREAMS_AFFECTED,
		TEXT_AUTO_REPLACE,
		@@ -4307,6 +4316,7 @@ public final class Settings {
		PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS);
		PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_FOR_VR);
		PUBLIC_SETTINGS.add(SCREEN_BRIGHTNESS_MODE);
		PUBLIC_SETTINGS.add(ADAPTIVE_SLEEP);
		PUBLIC_SETTINGS.add(MODE_RINGER_STREAMS_AFFECTED);
		PUBLIC_SETTINGS.add(MUTE_STREAMS_AFFECTED);
		PUBLIC_SETTINGS.add(VIBRATE_ON);
		@@ -4411,6 +4421,7 @@ public final class Settings {
		VALIDATORS.put(SCREEN_OFF_TIMEOUT, SCREEN_OFF_TIMEOUT_VALIDATOR);
		VALIDATORS.put(SCREEN_BRIGHTNESS_FOR_VR, SCREEN_BRIGHTNESS_FOR_VR_VALIDATOR);
		VALIDATORS.put(SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_VALIDATOR);
		VALIDATORS.put(ADAPTIVE_SLEEP, ADAPTIVE_SLEEP_VALIDATOR);
		VALIDATORS.put(MODE_RINGER_STREAMS_AFFECTED, MODE_RINGER_STREAMS_AFFECTED_VALIDATOR);
		VALIDATORS.put(MUTE_STREAMS_AFFECTED, MUTE_STREAMS_AFFECTED_VALIDATOR);
		VALIDATORS.put(VIBRATE_ON, VIBRATE_ON_VALIDATOR);

core/res/res/values/config.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -705,6 +705,9 @@
		Software implementation will be used if config_hardware_auto_brightness_available is not set -->
		<bool name="config_automatic_brightness_available">false</bool>

		<!-- Flag indicating whether we should enable the adaptive sleep.-->
		<bool name="config_adaptive_sleep_available">false</bool>

		<!-- Flag indicating whether we should enable smart battery. -->
		<bool name="config_smart_battery_available">false</bool>

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -1845,6 +1845,7 @@
		<java-symbol type="array" name="config_defaultNotificationVibePattern" />
		<java-symbol type="array" name="config_notificationFallbackVibePattern" />
		<java-symbol type="bool" name="config_useAttentionLight" />
		<java-symbol type="bool" name="config_adaptive_sleep_available" />
		<java-symbol type="bool" name="config_animateScreenLights" />
		<java-symbol type="bool" name="config_automatic_brightness_available" />
		<java-symbol type="bool" name="config_smart_battery_available" />

proto/src/metrics_constants/metrics_constants.proto

+4 −0

Original line number	Diff line number	Diff line
		@@ -6820,6 +6820,10 @@ message MetricsEvent {
		// OS: Q
		MOBILE_NETWORK_LIST = 1627;

		// OPEN: Settings > Display > Adaptive sleep
		// OS: Q
		SETTINGS_ADAPTIVE_SLEEP = 1628;

		// ---- End Q Constants, all Q constants go above this line ----
		// Add new aosp constants above this line.
		// END OF AOSP CONSTANTS