From 28b706484587077d1c8d1eb72d86ea8fe161e4c1 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Fri, 8 Apr 2022 16:09:02 -0700 Subject: [PATCH] Add config to fine tune emergency gesture min time This is the minimum time user has to perform the gesture for it to be considered valid. Bug: 228395041 Test: atest Change-Id: I7ce603e5530e13bf3552611c621a8e8b3cf5ab4c --- core/java/android/provider/Settings.java | 8 ++++++++ .../settings/validators/GlobalSettingsValidators.java | 2 ++ .../test/src/android/provider/SettingsBackupTest.java | 1 + 3 files changed, 11 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d8d9c7fc259ea..0df4f5feef506 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -14270,6 +14270,14 @@ public final class Settings { public static final String EMERGENCY_GESTURE_POWER_BUTTON_COOLDOWN_PERIOD_MS = "emergency_gesture_power_button_cooldown_period_ms"; + /** + * The minimum time in milliseconds to perform the emergency gesture. + * + * @hide + */ + public static final String EMERGENCY_GESTURE_TAP_DETECTION_MIN_TIME_MS = + "emergency_gesture_tap_detection_min_time_ms"; + /** * Whether to enable automatic system server heap dumps. This only works on userdebug or * eng builds, not on user builds. This is set by the user and overrides the config value. diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index bbfab0bfa792e..acb33c356a8ba 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -87,6 +87,8 @@ public class GlobalSettingsValidators { Global.EMERGENCY_TONE, new DiscreteValueValidator(new String[] {"0", "1", "2"})); VALIDATORS.put(Global.EMERGENCY_GESTURE_POWER_BUTTON_COOLDOWN_PERIOD_MS, NON_NEGATIVE_INTEGER_VALIDATOR); + VALIDATORS.put(Global.EMERGENCY_GESTURE_TAP_DETECTION_MIN_TIME_MS, + NON_NEGATIVE_INTEGER_VALIDATOR); VALIDATORS.put(Global.CALL_AUTO_RETRY, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.DOCK_AUDIO_MEDIA_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put( diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index e358b16d6ed41..d122cf5acab3e 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -257,6 +257,7 @@ public class SettingsBackupTest { Settings.Global.DROPBOX_TAG_PREFIX, Settings.Global.EMERGENCY_AFFORDANCE_NEEDED, Settings.Global.EMERGENCY_GESTURE_POWER_BUTTON_COOLDOWN_PERIOD_MS, + Settings.Global.EMERGENCY_GESTURE_TAP_DETECTION_MIN_TIME_MS, Settings.Global.EMULATE_DISPLAY_CUTOUT, Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, Settings.Global.ENABLE_CACHE_QUOTA_CALCULATION,