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

Commit 5220d10e authored by Harry Cutts's avatar Harry Cutts
Browse files

Remove settings for individual touchpad gestures 

These were never plumbed in, never mind launched, and are sometimes
causing confusion in design discussions when people have the feature
flag turned on. Let's remove them.

Bug: 245989146
Test: check the feature flag no longer appears in Developer Options >
      Feature flags
Flag: EXEMPT removing code controlled by a legacy sysprop-based flag
Change-Id: I365854a36fd7d210b2c9f93a373fa70e15e91a6a
parent 49e9bfc3

core/java/android/provider/Settings.java

+0 −43
Original line number Diff line number Diff line
@@ -12211,49 +12211,6 @@ public final class Settings { 
        public static final String BACK_GESTURE_INSET_SCALE_RIGHT =

                "back_gesture_inset_scale_right";













        /**













         * Indicates whether the trackpad back gesture is enabled.













         * <p>Type: int (0 for false, 1 for true)













         *













         * @hide













         */













        public static final String TRACKPAD_GESTURE_BACK_ENABLED = "trackpad_gesture_back_enabled";

























        /**













         * Indicates whether the trackpad home gesture is enabled.













         * <p>Type: int (0 for false, 1 for true)













         *













         * @hide













         */













        public static final String TRACKPAD_GESTURE_HOME_ENABLED = "trackpad_gesture_home_enabled";

























        /**













         * Indicates whether the trackpad overview gesture is enabled.













         * <p>Type: int (0 for false, 1 for true)













         *













         * @hide













         */













        public static final String TRACKPAD_GESTURE_OVERVIEW_ENABLED =













                "trackpad_gesture_overview_enabled";

























        /**













         * Indicates whether the trackpad notification gesture is enabled.













         * <p>Type: int (0 for false, 1 for true)













         *













         * @hide













         */













        public static final String TRACKPAD_GESTURE_NOTIFICATION_ENABLED =













                "trackpad_gesture_notification_enabled";

























        /**













         * Indicates whether the trackpad quick switch gesture is enabled.













         * <p>Type: int (0 for false, 1 for true)













         *













         * @hide













         */













        public static final String TRACKPAD_GESTURE_QUICK_SWITCH_ENABLED =













                "trackpad_gesture_quick_switch_enabled";



























        /**















         * Current provider of proximity-based sharing services.















         * Default value in @string/config_defaultNearbySharingComponent.

































core/java/android/util/FeatureFlagUtils.java



+0
−9




























Original line number
Diff line number
Diff line








@@ -99,13 +99,6 @@ public class FeatureFlagUtils {













     */















    public static final String SETTINGS_NEW_KEYBOARD_TRACKPAD = "settings_new_keyboard_trackpad";





























    /**













     * Enable trackpad gesture settings UI













     * @hide













     */













    public static final String SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE =













            "settings_new_keyboard_trackpad_gesture";





























    /**















     * Enable the new pages which is implemented with SPA.















     * @hide










@@ -211,7 +204,6 @@ public class FeatureFlagUtils {













        DEFAULT_FLAGS.put(SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, "true");















        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_MODIFIER_KEY, "true");















        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_TRACKPAD, "true");













        DEFAULT_FLAGS.put(SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE, "false");















        DEFAULT_FLAGS.put(SETTINGS_ENABLE_SPA, "true");















        DEFAULT_FLAGS.put(SETTINGS_ENABLE_SPA_PHASE2, "false");















        DEFAULT_FLAGS.put(SETTINGS_ENABLE_SPA_METRICS, "true");









@@ -237,7 +229,6 @@ public class FeatureFlagUtils {













        PERSISTENT_FLAGS.add(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME);















        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_MODIFIER_KEY);















        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_TRACKPAD);













        PERSISTENT_FLAGS.add(SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);















        PERSISTENT_FLAGS.add(SETTINGS_ENABLE_SPA);















        PERSISTENT_FLAGS.add(SETTINGS_ENABLE_SPA_PHASE2);















        PERSISTENT_FLAGS.add(SETTINGS_PREFER_ACCESSIBILITY_MENU_IN_SYSTEM);

































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



+2
−8




























Original line number
Diff line number
Diff line








@@ -645,14 +645,8 @@ message SecureSettingsProto {













    optional SettingProto theme_customization_overlay_packages = 75 [ (android.privacy).dest = DEST_AUTOMATIC ];















    optional SettingProto trust_agents_initialized = 57 [ (android.privacy).dest = DEST_AUTOMATIC ];





























    message TrackpadGesture {













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













        optional SettingProto trackpad_gesture_home_enabled = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto trackpad_gesture_overview_enabled = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto trackpad_gesture_notification_enabled = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto trackpad_gesture_quick_switch_enabled = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];













    }













    optional TrackpadGesture trackpad_gesture = 94;













    reserved 94;  // formerly trackpad_gesture













    reserved "trackpad_gesture";































    message Tts {















        option (android.msg_privacy).dest = DEST_EXPLICIT;

































packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java



+0
−5




























Original line number
Diff line number
Diff line








@@ -186,11 +186,6 @@ public class SecureSettings {













        Settings.Secure.BACK_GESTURE_INSET_SCALE_LEFT,















        Settings.Secure.BACK_GESTURE_INSET_SCALE_RIGHT,















        Settings.Secure.NAVIGATION_MODE,













        Settings.Secure.TRACKPAD_GESTURE_BACK_ENABLED,













        Settings.Secure.TRACKPAD_GESTURE_HOME_ENABLED,













        Settings.Secure.TRACKPAD_GESTURE_OVERVIEW_ENABLED,













        Settings.Secure.TRACKPAD_GESTURE_NOTIFICATION_ENABLED,













        Settings.Secure.TRACKPAD_GESTURE_QUICK_SWITCH_ENABLED,















        Settings.Secure.SKIP_GESTURE_COUNT,















        Settings.Secure.SKIP_TOUCH_COUNT,















        Settings.Secure.SILENCE_ALARMS_GESTURE_COUNT,

































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



+0
−5




























Original line number
Diff line number
Diff line








@@ -284,11 +284,6 @@ public class SecureSettingsValidators {













                new InclusiveFloatRangeValidator(0.0f, Float.MAX_VALUE));















        VALIDATORS.put(Secure.BACK_GESTURE_INSET_SCALE_RIGHT,















                new InclusiveFloatRangeValidator(0.0f, Float.MAX_VALUE));













        VALIDATORS.put(Secure.TRACKPAD_GESTURE_BACK_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.TRACKPAD_GESTURE_HOME_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.TRACKPAD_GESTURE_OVERVIEW_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.TRACKPAD_GESTURE_NOTIFICATION_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.TRACKPAD_GESTURE_QUICK_SWITCH_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.AWARE_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.SKIP_GESTURE_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);















        VALIDATORS.put(Secure.SKIP_TOUCH_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);