Merge "Add a setting to enable the triple press gesture to toggle accessibility in wear." (584d27f2) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -3999,6 +3999,16 @@ public final class Settings {
		*/
		public static final int ADVANCED_SETTINGS_DEFAULT = 0;

		/**
		* If the triple press gesture for toggling accessibility is enabled.
		* Set to 1 for true and 0 for false.
		*
		* This setting is used only internally.
		* @hide
		*/
		public static final String WEAR_ACCESSIBILITY_GESTURE_ENABLED
		= "wear_accessibility_gesture_enabled";

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,8 @@ public class SettingsBackupTest {
		Settings.System.PEAK_REFRESH_RATE, // depends on hardware capabilities
		Settings.System.SCREEN_BRIGHTNESS_FLOAT,
		Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT,
		Settings.System.MULTI_AUDIO_FOCUS_ENABLED // form-factor/OEM specific
		Settings.System.MULTI_AUDIO_FOCUS_ENABLED, // form-factor/OEM specific
		Settings.System.WEAR_ACCESSIBILITY_GESTURE_ENABLED
		);

		private static final Set<String> BACKUP_DENY_LIST_GLOBAL_SETTINGS =