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

Commit 42ff9dd1 authored by Mehdi Alizadeh's avatar Mehdi Alizadeh Committed by android-build-merger
Browse files

Adds entries for Swipe Up Enable in Settings.Secure 

am: 1264d880

Change-Id: I4dd2b567cc6c7b7aae70c0042a4e4a9650fc7b8c
parents 6771fb65 1264d880

core/java/android/provider/Settings.java

+14 −0
Original line number Diff line number Diff line
@@ -7383,6 +7383,17 @@ public final class Settings { 
        private static final Validator CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED_VALIDATOR =

                BOOLEAN_VALIDATOR;



        /**

         * Whether the swipe up gesture to switch apps should be enabled.

         *

         * @hide

         */

        public static final String SWIPE_UP_TO_SWITCH_APPS_ENABLED =

                "swipe_up_to_switch_apps_enabled";



        private static final Validator SWIPE_UP_TO_SWITCH_APPS_ENABLED_VALIDATOR =

                BOOLEAN_VALIDATOR;



        /**

         * Whether or not the smart camera lift trigger that launches the camera when the user moves

         * the phone into a position for taking photos should be enabled.
@@ -7894,6 +7905,7 @@ public final class Settings { 
            NIGHT_DISPLAY_AUTO_MODE,

            SYNC_PARENT_SOUNDS,

            CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED,

            SWIPE_UP_TO_SWITCH_APPS_ENABLED,

            CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,

            SYSTEM_NAVIGATION_KEYS_ENABLED,

            QS_TILES,
@@ -8027,6 +8039,8 @@ public final class Settings { 
            VALIDATORS.put(SYNC_PARENT_SOUNDS, SYNC_PARENT_SOUNDS_VALIDATOR);

            VALIDATORS.put(CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED,

                    CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED_VALIDATOR);

            VALIDATORS.put(SWIPE_UP_TO_SWITCH_APPS_ENABLED,

                    SWIPE_UP_TO_SWITCH_APPS_ENABLED_VALIDATOR);

            VALIDATORS.put(CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,

                    CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED_VALIDATOR);

            VALIDATORS.put(SYSTEM_NAVIGATION_KEYS_ENABLED,

core/proto/android/providers/settings/secure.proto

+8 −1
Original line number Diff line number Diff line
@@ -213,6 +213,13 @@ message SecureSettingsProto { 
    optional SettingProto keyguard_slice_uri = 29;

    optional SettingProto last_setup_shown = 30 [ (android.privacy).dest = DEST_AUTOMATIC ];



    message Launcher {

        option (android.msg_privacy).dest = DEST_EXPLICIT;



        optional SettingProto swipe_up_to_switch_apps_enabled = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];

    }

    optional Launcher launcher = 70;



    message Location {

        option (android.msg_privacy).dest = DEST_EXPLICIT;
@@ -479,5 +486,5 @@ message SecureSettingsProto { 


    // Please insert fields in alphabetical order and group them into messages

    // if possible (to avoid reaching the method limit).

    // Next tag = 70;

    // Next tag = 71;

}

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+6 −0
Original line number Diff line number Diff line
@@ -2231,6 +2231,12 @@ class SettingsProtoDumpUtil { 
                Settings.Secure.WAKE_GESTURE_ENABLED,

                SecureSettingsProto.WAKE_GESTURE_ENABLED);



        final long launcherToken = p.start(SecureSettingsProto.LAUNCHER);

        dumpSetting(s, p,

                Settings.Secure.SWIPE_UP_TO_SWITCH_APPS_ENABLED,

                SecureSettingsProto.Launcher.SWIPE_UP_TO_SWITCH_APPS_ENABLED);

        p.end(launcherToken);



        // Please insert new settings using the same order as in SecureSettingsProto.

        p.end(token);

proto/src/metrics_constants.proto

+5 −0
Original line number Diff line number Diff line
@@ -5578,6 +5578,11 @@ message MetricsEvent { 
    // OS: P

    WIFI_SCANNING_NEEDED_DIALOG = 1373;



    // OPEN: Settings > System > Gestures > Swipe up gesture

    // CATEGORY: SETTINGS

    // OS: P

    SETTINGS_GESTURE_SWIPE_UP = 1374;



    // ---- End P Constants, all P constants go above this line ----

    // Add new aosp constants above this line.

    // END OF AOSP CONSTANTS