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

Commit ebd679b1 authored by Jean Chen's avatar Jean Chen
Browse files

Revert "feat(multi finger multi tap): add Setting for control magnification enable gesture" 

This reverts commit ceb7f4d9.

Reason for revert: <Use the new settings, ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED, instead>

Bug: 297805269
Test: manual
Change-Id: I5eb125bd154e312a8d804f103d7a4dc7cc73146c
parent e9fc0fb0

core/java/android/provider/Settings.java

+0 −39
Original line number Diff line number Diff line
@@ -11661,45 +11661,6 @@ public final class Settings { 
        public static final String ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED =

                "accessibility_magnification_two_finger_triple_tap_enabled";













        /**













         * Controls magnification enable gesture. Accessibility magnification can have one or more













         * enable gestures.













         *













         * @see #ACCESSIBILITY_MAGNIFICATION_GESTURE_NONE













         * @see #ACCESSIBILITY_MAGNIFICATION_GESTURE_SINGLE_FINGER_TRIPLE_TAP













         * @see #ACCESSIBILITY_MAGNIFICATION_GESTURE_TWO_FINGER_TRIPLE_TAP













         * @hide













         */













        public static final String ACCESSIBILITY_MAGNIFICATION_GESTURE =













                "accessibility_magnification_gesture";

























        /**













         * Magnification enable gesture value that is a default value.













         * @hide













         */













        public static final int ACCESSIBILITY_MAGNIFICATION_GESTURE_NONE = 0x0;

























        /**













         * Magnification enable gesture value is single finger triple tap.













         * @hide













         */













        public static final int ACCESSIBILITY_MAGNIFICATION_GESTURE_SINGLE_FINGER_TRIPLE_TAP = 0x1;

























        /**













         * Magnification enable gesture value is two finger triple tap.













         * @hide













         */













        public static final int ACCESSIBILITY_MAGNIFICATION_GESTURE_TWO_FINGER_TRIPLE_TAP = 0x2;

























        /**













         * Magnification enable gesture values include single finger triple tap and two finger













         * triple tap.













         * @hide













         */













        public static final int ACCESSIBILITY_MAGNIFICATION_GESTURE_ALL =













                ACCESSIBILITY_MAGNIFICATION_GESTURE_SINGLE_FINGER_TRIPLE_TAP













                | ACCESSIBILITY_MAGNIFICATION_GESTURE_TWO_FINGER_TRIPLE_TAP;



























        /**















         * Controls magnification capability. Accessibility magnification is capable of at least one















         * of the magnification modes.

































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



+2
−2




























Original line number
Diff line number
Diff line








@@ -98,8 +98,8 @@ message SecureSettingsProto {













        // Settings for font scaling















        optional SettingProto accessibility_font_scaling_has_been_changed = 51 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto accessibility_force_invert_color_enabled = 52 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto accessibility_magnification_gesture = 53 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto accessibility_magnification_two_finger_triple_tap_enabled = 54 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto accessibility_magnification_two_finger_triple_tap_enabled = 53 [ (android.privacy).dest = DEST_AUTOMATIC ];





























    }















    optional Accessibility accessibility = 2;

















































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



+0
−1




























Original line number
Diff line number
Diff line








@@ -219,7 +219,6 @@ public class SecureSettings {













        Settings.Secure.ACCESSIBILITY_FORCE_INVERT_COLOR_ENABLED,















        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,















        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED,













        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE,















        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,















        Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,















        Settings.Secure.NOTIFICATION_BUBBLES,

































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



+0
−4




























Original line number
Diff line number
Diff line








@@ -312,10 +312,6 @@ public class SecureSettingsValidators {













        VALIDATORS.put(















                Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,















                BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE,













                new InclusiveIntegerRangeValidator(













                        Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE_NONE,













                        Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE_ALL));















        VALIDATORS.put(















                Secure.ACCESSIBILITY_BUTTON_TARGETS,















                ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);

































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



+0
−4




























Original line number
Diff line number
Diff line








@@ -1853,10 +1853,6 @@ class SettingsProtoDumpUtil {













                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,















                SecureSettingsProto.Accessibility















                        .ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED);













        dumpSetting(s, p,













                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_GESTURE,













                SecureSettingsProto.Accessibility













                        .ACCESSIBILITY_MAGNIFICATION_GESTURE);















        dumpSetting(s, p,















                Settings.Secure.HEARING_AID_RINGTONE_ROUTING,















                SecureSettingsProto.Accessibility.HEARING_AID_RINGTONE_ROUTING);