Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add config to fine tune emergency gesture min time" into tm-dev

Browse Source
This commit is contained in:
Fan Zhang
2022-04-10 06:09:13 +00:00
committed by Android (Google) Code Review
parent ffa1d57dae 28b7064845
commit b50f582a54
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/provider/Settings.java
View File

@@ -14270,6 +14270,14 @@ public final class Settings {
public static final String EMERGENCY_GESTURE_POWER_BUTTON_COOLDOWN_PERIOD_MS = public static final String EMERGENCY_GESTURE_POWER_BUTTON_COOLDOWN_PERIOD_MS =
"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 * 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. * eng builds, not on user builds. This is set by the user and overrides the config value.

2
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

@@ -87,6 +87,8 @@ public class GlobalSettingsValidators {
Global.EMERGENCY_TONE, new DiscreteValueValidator(new String[] {"0", "1", "2"})); Global.EMERGENCY_TONE, new DiscreteValueValidator(new String[] {"0", "1", "2"}));
VALIDATORS.put(Global.EMERGENCY_GESTURE_POWER_BUTTON_COOLDOWN_PERIOD_MS, VALIDATORS.put(Global.EMERGENCY_GESTURE_POWER_BUTTON_COOLDOWN_PERIOD_MS,
NON_NEGATIVE_INTEGER_VALIDATOR); 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.CALL_AUTO_RETRY, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.DOCK_AUDIO_MEDIA_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.DOCK_AUDIO_MEDIA_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put( VALIDATORS.put(

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -257,6 +257,7 @@ public class SettingsBackupTest {
Settings.Global.DROPBOX_TAG_PREFIX, Settings.Global.DROPBOX_TAG_PREFIX,
Settings.Global.EMERGENCY_AFFORDANCE_NEEDED, Settings.Global.EMERGENCY_AFFORDANCE_NEEDED,
Settings.Global.EMERGENCY_GESTURE_POWER_BUTTON_COOLDOWN_PERIOD_MS, 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.EMULATE_DISPLAY_CUTOUT,
Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED,
Settings.Global.ENABLE_CACHE_QUOTA_CALCULATION, Settings.Global.ENABLE_CACHE_QUOTA_CALCULATION,