From 696aa291454dd05eaba9b0fca878e4dcfd5d4369 Mon Sep 17 00:00:00 2001 From: Prakriti Gupta Date: Thu, 17 Feb 2022 07:53:17 +0000 Subject: [PATCH] Add settings key for touch and hold watch face Bug: 216332461, 222022449 Test: Unit test Change-Id: Idcd5740583ca9fe4b711ef7a9466daa74047aea5 (cherry picked from commit 20b021ff3eb5c9c6de0ec061551c76f61e0a7a3e) --- core/java/android/provider/Settings.java | 6 ++++++ .../settings/validators/GlobalSettingsValidators.java | 1 + .../test/src/android/provider/SettingsBackupTest.java | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f2137b30350af..f1c9b5d23c55b 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -17206,6 +17206,12 @@ public final class Settings { */ public static final String AMBIENT_TILT_TO_BRIGHT = "ambient_tilt_to_bright"; + /** + * Whether touch and hold to edit WF is enabled + * @hide + */ + public static final String TOUCH_AND_HOLD_WATCH_FACE = "touch_and_hold_watchface"; + /** * Whether the current watchface is decomposable. * @hide diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index bbfab0bfa792e..a7966eb52be49 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -315,6 +315,7 @@ public class GlobalSettingsValidators { VALIDATORS.put(Global.USER_PREFERRED_RESOLUTION_WIDTH, ANY_INTEGER_VALIDATOR); VALIDATORS.put(Global.Wearable.WET_MODE_ON, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.COOLDOWN_MODE_ON, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.Wearable.TOUCH_AND_HOLD_WATCH_FACE, BOOLEAN_VALIDATOR); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 3f4372bd78ffc..d7fce5ba0d522 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -661,7 +661,8 @@ public class SettingsBackupTest { Settings.Global.Wearable.CLOCKWORK_LONG_PRESS_TO_ASSISTANT_ENABLED, Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER, Settings.Global.Wearable.WET_MODE_ON, - Settings.Global.Wearable.COOLDOWN_MODE_ON); + Settings.Global.Wearable.COOLDOWN_MODE_ON, + Settings.Global.Wearable.TOUCH_AND_HOLD_WATCH_FACE); private static final Set BACKUP_DENY_LIST_SECURE_SETTINGS = newHashSet(