Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b50f582a authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

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

parents ffa1d57d 28b70648

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -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.

























packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -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(

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -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,