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

Commit 29ec0227 authored by Tyler Freeman's avatar Tyler Freeman Committed by Android (Google) Code Review
Browse files

Merge "feat(#MagnificationJoystick): add Setting for enabling Joystick"

parents 7dfb8cf7 372a801e

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -11228,6 +11228,13 @@ public final class Settings { 
        public static final String ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED =

                "accessibility_magnification_follow_typing_enabled";













        /**













         * Whether the magnification joystick controller feature is enabled.













         * @hide













         */













        public static final String ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED =













                "accessibility_magnification_joystick_enabled";



























        /**















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















         * of the magnification modes.

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -94,6 +94,7 @@ message SecureSettingsProto {













        optional SettingProto hearing_aid_call_routing = 47 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto hearing_aid_media_routing = 48 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto hearing_aid_system_sounds_routing = 49 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto accessibility_magnification_joystick_enabled = 50 [ (android.privacy).dest = DEST_AUTOMATIC ];















    }















    optional Accessibility accessibility = 2;

















































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



+1
−0




























Original line number
Diff line number
Diff line








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













        Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY,















        Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,















        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,













        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED,















        Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,















        Settings.Secure.NOTIFICATION_BUBBLES,















        Settings.Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED,

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -298,6 +298,7 @@ public class SecureSettingsValidators {













                        Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL));















        VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(















                Secure.ACCESSIBILITY_BUTTON_TARGETS,















                ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);

































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



+4
−0




























Original line number
Diff line number
Diff line








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













                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED,















                SecureSettingsProto.Accessibility















                        .ACCESSIBILITY_MAGNIFICATION_ALWAYS_ON_ENABLED);













        dumpSetting(s, p,













                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED,













                SecureSettingsProto.Accessibility













                        .ACCESSIBILITY_MAGNIFICATION_JOYSTICK_ENABLED);















        dumpSetting(s, p,















                Settings.Secure.HEARING_AID_RINGTONE_ROUTING,















                SecureSettingsProto.Accessibility.HEARING_AID_RINGTONE_ROUTING);