From 07585b10a497fdadaa42ef3c7de897f94c6a9539 Mon Sep 17 00:00:00 2001 From: Yeabkal Wubshit Date: Mon, 10 Mar 2025 15:27:19 -0700 Subject: Create Setting keys for Wear gesture input actions Bug: 400481456 Test: presubmit Flag: EXEMPT addition of settings keys which are hidden Change-Id: I899066d41603063e3f4f683ddbe236ac0b7a49d2 --- core/java/android/provider/Settings.java | 18 ++++++++++++++++++ .../provider/settings/backup/GlobalSettings.java | 2 ++ .../settings/validators/GlobalSettingsValidators.java | 2 ++ 3 files changed, 22 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index da4709b4b8b1..3d256fd5be46 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -20799,6 +20799,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) diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java index fc61b1e875f3..d3291b4bac17 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java @@ -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, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 4c6a1ba7db0a..cd6521ff0dc5 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -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); } } -- cgit v1.2.3-59-g8ed1b