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

Commit bc079ff0 authored by Daniel Hsieh's avatar Daniel Hsieh Committed by Android (Google) Code Review
Browse files

Merge "Support following typing focus in window mode [3/n]."

parents edd5a074 f4e9ca2c

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -10247,6 +10247,13 @@ public final class Settings { 
        @TestApi

        public static final int ACCESSIBILITY_MAGNIFICATION_MODE_ALL = 0x3;













        /**













         * Whether the following typing focus feature for magnification is enabled.













         * @hide













         */













        public static final String ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED =













                "accessibility_magnification_follow_typing_enabled";



























        /**















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















         * of the magnification modes.

































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



+2
−0




























Original line number
Diff line number
Diff line








@@ -86,6 +86,8 @@ message SecureSettingsProto {













        optional SettingProto accessibility_floating_menu_opacity = 40 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto accessibility_floating_menu_fade_enabled = 41 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto odi_captions_volume_ui_enabled = 42 [ (android.privacy).dest = DEST_AUTOMATIC ];













        // Setting for accessibility magnification for following typing.













        optional SettingProto accessibility_magnification_follow_typing_enabled = 43 [ (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








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













        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,















        Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,















        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY,













        Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,















        Settings.Secure.ONE_HANDED_MODE_ACTIVATED,















        Settings.Secure.ONE_HANDED_MODE_ENABLED,















        Settings.Secure.ONE_HANDED_MODE_TIMEOUT,

































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



+1
−0




























Original line number
Diff line number
Diff line








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













                new InclusiveIntegerRangeValidator(















                        Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,















                        Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL));













        VALIDATORS.put(Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_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








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













        dumpSetting(s, p,















                Settings.Secure.ODI_CAPTIONS_VOLUME_UI_ENABLED,















                SecureSettingsProto.Accessibility.ODI_CAPTIONS_VOLUME_UI_ENABLED);













        dumpSetting(s, p,













                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED,













                SecureSettingsProto.Accessibility













                        .ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED);















        p.end(accessibilityToken);































        final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP);