Merge "Add WEAR_TTS_PREWARM_ENABLED settings key" into main (c43542cd) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -4579,6 +4579,16 @@ public final class Settings {
		public static final String WEAR_ACCESSIBILITY_GESTURE_ENABLED_DURING_OOBE =
		"wear_accessibility_gesture_enabled_during_oobe";


		/**
		* If the text-to-speech pre-warm is enabled.
		* Set to 1 for true and 0 for false.
		*
		* This setting is used only internally.
		* @hide
		*/
		public static final String WEAR_TTS_PREWARM_ENABLED = "wear_tts_prewarm_enabled";

		/**
		* @deprecated Use {@link android.provider.Settings.Global#AIRPLANE_MODE_ON} instead
		*/
		@@ -6017,6 +6027,7 @@ public final class Settings {
		PRIVATE_SETTINGS.add(ADVANCED_SETTINGS);
		PRIVATE_SETTINGS.add(WEAR_ACCESSIBILITY_GESTURE_ENABLED);
		PRIVATE_SETTINGS.add(WEAR_ACCESSIBILITY_GESTURE_ENABLED_DURING_OOBE);
		PRIVATE_SETTINGS.add(WEAR_TTS_PREWARM_ENABLED);
		PRIVATE_SETTINGS.add(SCREEN_AUTO_BRIGHTNESS_ADJ);
		PRIVATE_SETTINGS.add(VIBRATE_INPUT_DEVICES);
		PRIVATE_SETTINGS.add(VOLUME_MASTER);

+1 −0

Original line number	Diff line number	Diff line
		@@ -223,6 +223,7 @@ public class SystemSettingsValidators {
		VALIDATORS.put(System.NOTIFICATION_LIGHT_PULSE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.WEAR_ACCESSIBILITY_GESTURE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.WEAR_ACCESSIBILITY_GESTURE_ENABLED_DURING_OOBE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.WEAR_TTS_PREWARM_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.CLOCKWORK_BLUETOOTH_SETTINGS_PREF, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.UNREAD_NOTIFICATION_DOT_INDICATOR, BOOLEAN_VALIDATOR);
		VALIDATORS.put(System.AUTO_LAUNCH_MEDIA_CONTROLS, BOOLEAN_VALIDATOR);

+1 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ public class SettingsBackupTest {
		Settings.System.PEAK_REFRESH_RATE, // depends on hardware capabilities
		Settings.System.SCREEN_BRIGHTNESS_FLOAT,
		Settings.System.WEAR_ACCESSIBILITY_GESTURE_ENABLED_DURING_OOBE,
		Settings.System.WEAR_TTS_PREWARM_ENABLED,
		Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ,
		Settings.System.MULTI_AUDIO_FOCUS_ENABLED // form-factor/OEM specific
		);