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

Commit fe611a57 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am:... 

Merge "Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am: a74fbef8" into pi-dev-plus-aosp
parents 6c40e474 ecc07726

core/java/android/provider/Settings.java

+0 −9
Original line number Diff line number Diff line
@@ -7537,9 +7537,6 @@ public final class Settings { 
         */

        public static final String ASSIST_GESTURE_SENSITIVITY = "assist_gesture_sensitivity";













        private static final Validator ASSIST_GESTURE_SENSITIVITY_VALIDATOR =













                new SettingsValidators.InclusiveFloatRangeValidator(0.0f, 1.0f);



























        /**















         * Whether the assist gesture should silence alerts.















         *










@@ -7569,8 +7566,6 @@ public final class Settings {













         */















        public static final String ASSIST_GESTURE_SETUP_COMPLETE = "assist_gesture_setup_complete";



























        private static final Validator ASSIST_GESTURE_SETUP_COMPLETE_VALIDATOR = BOOLEAN_VALIDATOR;



























        /**















         * Control whether Night display is currently activated.















         * @hide










@@ -8026,8 +8021,6 @@ public final class Settings {













            NFC_PAYMENT_DEFAULT_COMPONENT,















            AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,















            ASSIST_GESTURE_ENABLED,













            ASSIST_GESTURE_SENSITIVITY,













            ASSIST_GESTURE_SETUP_COMPLETE,















            ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,















            ASSIST_GESTURE_WAKE_ENABLED,















            VR_DISPLAY_MODE,










@@ -8166,8 +8159,6 @@ public final class Settings {













            VALIDATORS.put(AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,















                    AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_VALIDATOR);















            VALIDATORS.put(ASSIST_GESTURE_ENABLED, ASSIST_GESTURE_ENABLED_VALIDATOR);













            VALIDATORS.put(ASSIST_GESTURE_SENSITIVITY, ASSIST_GESTURE_SENSITIVITY_VALIDATOR);













            VALIDATORS.put(ASSIST_GESTURE_SETUP_COMPLETE, ASSIST_GESTURE_SETUP_COMPLETE_VALIDATOR);















            VALIDATORS.put(ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,















                    ASSIST_GESTURE_SILENCE_ALERTS_ENABLED_VALIDATOR);















            VALIDATORS.put(ASSIST_GESTURE_WAKE_ENABLED, ASSIST_GESTURE_WAKE_ENABLED_VALIDATOR);

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -508,6 +508,8 @@ public class SettingsBackupTest {













                 Settings.Secure.ANR_SHOW_BACKGROUND,















                 Settings.Secure.ASSISTANT,















                 Settings.Secure.ASSIST_DISCLOSURE_ENABLED,













                 Settings.Secure.ASSIST_GESTURE_SENSITIVITY,













                 Settings.Secure.ASSIST_GESTURE_SETUP_COMPLETE,















                 Settings.Secure.ASSIST_SCREENSHOT_ENABLED,















                 Settings.Secure.ASSIST_STRUCTURE_ENABLED,















                 Settings.Secure.AUTOFILL_FEATURE_FIELD_CLASSIFICATION,