Merge "Create Setting keys for Wear gesture input actions" into main (fe243d08) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -20815,6 +20815,24 @@ public final class Settings {
		@Readable
		public static final String WEAR_LAUNCHER_UI_MODE = "wear_launcher_ui_mode";

		/**
		* Setting indicating whether the primary gesture input action has been enabled by the
		* user.
		*
		* @hide
		*/
		public static final String GESTURE_PRIMARY_ACTION_USER_PREFERENCE =
		"gesture_primary_action_user_preference";

		/**
		* Setting indicating whether the dismiss gesture input action has been enabled by the
		* user.
		*
		* @hide
		*/
		public static final String GESTURE_DISMISS_ACTION_USER_PREFERENCE =
		"gesture_dismiss_action_user_preference";

		/** Whether Wear Power Anomaly Service is enabled.
		*
		* (0 = false, 1 = true)

+2 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,8 @@ public class GlobalSettings {
		Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED,
		Settings.Global.Wearable.WRIST_DETECTION_AUTO_LOCKING_ENABLED,
		Settings.Global.Wearable.AUTO_BEDTIME_MODE,
		Settings.Global.Wearable.GESTURE_PRIMARY_ACTION_USER_PREFERENCE,
		Settings.Global.Wearable.GESTURE_DISMISS_ACTION_USER_PREFERENCE,
		Settings.Global.FORCE_ENABLE_PSS_PROFILING,
		Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_ENABLED,
		Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_TYPE,

+2 −0

Original line number	Diff line number	Diff line
		@@ -474,5 +474,7 @@ public class GlobalSettingsValidators {
		String.valueOf(
		Global.Wearable.STATUS_TRAY_CONFIGURATION_SYSTEM_HIDDEN)
		}));
		VALIDATORS.put(Global.Wearable.GESTURE_PRIMARY_ACTION_USER_PREFERENCE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.GESTURE_DISMISS_ACTION_USER_PREFERENCE, BOOLEAN_VALIDATOR);
		}
		}