From 32af83b2cbdceda016116c522d9135478c01b38e Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Fri, 18 Oct 2019 12:31:24 +0800 Subject: [PATCH] Add Tap Gesture for Aware Settings - Add new settings provider key for tap gesture. Bug: 142702985 Test: atest & manual Change-Id: Ib76327b37a415512145a150a4b0e176a6cb114d7 --- core/java/android/provider/Settings.java | 6 ++++++ .../settings/validators/SecureSettingsValidators.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 aeed20db28503..dbbf05b31aee4 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8253,6 +8253,12 @@ public final class Settings { */ public static final String AWARE_LOCK_ENABLED = "aware_lock_enabled"; + /** + * Controls whether tap gesture is enabled. + * @hide + */ + public static final String TAP_GESTURE = "tap_gesture"; + /** * Keys we no longer back up under the current schema, but want to continue to * process when restoring historical backup datasets. diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index f7fc0c5fdc494..0c3254a5ed029 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -228,5 +228,6 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.GLOBAL_ACTIONS_PANEL_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.AWARE_LOCK_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.DISPLAY_DENSITY_FORCED, NON_NEGATIVE_INTEGER_VALIDATOR); + VALIDATORS.put(Secure.TAP_GESTURE, BOOLEAN_VALIDATOR); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 9255c87283926..10d990a3d07f8 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -732,7 +732,8 @@ public class SettingsBackupTest { Settings.Secure.SILENCE_GESTURE, Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE, Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE, - Settings.Secure.FACE_UNLOCK_RE_ENROLL); + Settings.Secure.FACE_UNLOCK_RE_ENROLL, + Settings.Secure.TAP_GESTURE); @Test public void systemSettingsBackedUpOrBlacklisted() {