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

Commit 9410e757 authored by Riley Jones's avatar Riley Jones
Browse files

Renaming ACCESSIBILITY_FLOATING_MENU_TARGETS to ACCESSIBILITY_GESTURE_TARGETS 

For our intended behavior it is more beneficial to have a separate setting for gesture.
Since this setting was not in use yet, there should be no problems renaming it.

Bug: 300303284
Flag: N/A
Test: N/A
Change-Id: Ic2f14a15c1dc2f4e7391e9ce8ca0036998b6d642
parent 4f777f5c

core/java/android/provider/Settings.java

+5 −4
Original line number Diff line number Diff line
@@ -8501,7 +8501,8 @@ public final class Settings { 














        /**















         * Setting specifying the accessibility services, accessibility shortcut targets,













         * or features to be toggled via the accessibility button in the navigation bar.













         * or features to be toggled via the accessibility button in the navigation bar,













         * or the floating accessibility button.















         *















         * <p> This is a colon-separated string list which contains the flattened















         * {@link ComponentName} and the class name of a system class implementing a supported









@@ -8513,7 +8514,7 @@ public final class Settings {



























        /**















         * Setting specifying the accessibility services, shortcut targets or features













         * to be toggled via the floating accessibility menu













         * to be toggled via the gesture shortcut















         *















         * <p> This is a colon-separated string list which contains the flattened















         * {@link ComponentName} and the class name of a system class









@@ -8521,8 +8522,8 @@ public final class Settings {













         * @hide















         */















        @Readable













        public static final String ACCESSIBILITY_FLOATING_MENU_TARGETS =













                "accessibility_floating_menu_targets";













        public static final String ACCESSIBILITY_GESTURE_TARGETS =













                "accessibility_gesture_targets";





























        /**















         * Setting specifying the accessibility services, accessibility shortcut targets,

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -102,7 +102,7 @@ message SecureSettingsProto {













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















        optional SettingProto accessibility_pinch_to_zoom_anywhere_enabled = 55 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto accessibility_single_finger_panning_enabled = 56 [ (android.privacy).dest = DEST_AUTOMATIC ];













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













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















        optional SettingProto display_daltonizer_saturation_level = 58 [ (android.privacy).dest = DEST_AUTOMATIC ];































    }

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -272,7 +272,7 @@ public class SecureSettings {













        Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS,















        Settings.Secure.AUDIO_DEVICE_INVENTORY,















        Settings.Secure.SCREEN_RESOLUTION_MODE,













        Settings.Secure.ACCESSIBILITY_FLOATING_MENU_TARGETS,













        Settings.Secure.ACCESSIBILITY_GESTURE_TARGETS,















        Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_SATURATION_LEVEL,















        Settings.Secure.CHARGE_OPTIMIZATION_MODE















    };

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -326,7 +326,7 @@ public class SecureSettingsValidators {













                Secure.ACCESSIBILITY_BUTTON_TARGETS,















                ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);















        VALIDATORS.put(













                Secure.ACCESSIBILITY_FLOATING_MENU_TARGETS,













                Secure.ACCESSIBILITY_GESTURE_TARGETS,















                ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);















        VALIDATORS.put(















                Secure.ACCESSIBILITY_QS_TARGETS,

































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



+2
−2




























Original line number
Diff line number
Diff line








@@ -1841,8 +1841,8 @@ class SettingsProtoDumpUtil {













                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,















                SecureSettingsProto.Accessibility.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED);















        dumpSetting(s, p,













                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_TARGETS,













                SecureSettingsProto.Accessibility.ACCESSIBILITY_FLOATING_MENU_TARGETS);













                Settings.Secure.ACCESSIBILITY_GESTURE_TARGETS,













                SecureSettingsProto.Accessibility.ACCESSIBILITY_GESTURE_TARGETS);















        dumpSetting(s, p,















                Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,















                SecureSettingsProto.Accessibility.ODI_CAPTIONS_VOLUME_UI_ENABLED);