From 1253d56f26ffc0cbd71bbd18fa36a3eb069234ea Mon Sep 17 00:00:00 2001 From: Josh Yang Date: Fri, 13 Nov 2020 12:06:31 -0800 Subject: [PATCH] Add gesture settings to system settings provider Bug: 172168582 Test: manual tested Change-Id: If8e6c588209d308d490368580310a4f589f1c08c (cherry picked from commit 7eca5ecf22ac4a6c9234c130a61f75f540faec08) --- core/java/android/provider/Settings.java | 12 ++++++++++++ .../validators/GlobalSettingsValidators.java | 2 ++ .../src/android/provider/SettingsBackupTest.java | 4 +++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 7376ac55238c2..dcce9a67b4ac2 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -16694,6 +16694,18 @@ public final class Settings { * @hide */ public static final String OEM_SETUP_VERSION = "oem_setup_version"; + + /** + * Controls the gestures feature. + * @hide + */ + public static final String MASTER_GESTURES_ENABLED = "master_gestures_enabled"; + + /** + * Whether or not ungaze is enabled. + * @hide + */ + public static final String UNGAZE_ENABLED = "ungaze_enabled"; } } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index a9245f8a40e16..41c9cf04b4283 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -292,6 +292,8 @@ public class GlobalSettingsValidators { VALIDATORS.put(Global.Wearable.COMPANION_OS_VERSION, ANY_INTEGER_VALIDATOR); VALIDATORS.put(Global.Wearable.ENABLE_ALL_LANGUAGES, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.OEM_SETUP_VERSION, ANY_INTEGER_VALIDATOR); + VALIDATORS.put(Global.Wearable.MASTER_GESTURES_ENABLED, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.Wearable.UNGAZE_ENABLED, BOOLEAN_VALIDATOR); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 6a4b5e95e4a2b..1c850a1aefc25 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -656,7 +656,9 @@ public class SettingsBackupTest { Settings.Global.Wearable.COMPANION_OS_VERSION, Settings.Global.Wearable.ENABLE_ALL_LANGUAGES, Settings.Global.Wearable.SETUP_LOCALE, - Settings.Global.Wearable.OEM_SETUP_VERSION); + Settings.Global.Wearable.OEM_SETUP_VERSION, + Settings.Global.Wearable.MASTER_GESTURES_ENABLED, + Settings.Global.Wearable.UNGAZE_ENABLED); private static final Set BACKUP_DENY_LIST_SECURE_SETTINGS = newHashSet(