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

Commit b3403373 authored by Lauren Winston's avatar Lauren Winston Committed by Android (Google) Code Review
Browse files

Merge "Add Settings.Secure values for Software Cursor settings for hiding... 

Merge "Add Settings.Secure values for Software Cursor settings for hiding trigger hints and for shifting the trigger region when the keyboard is opened."
parents e0a6b1e4 36e81f29

core/java/android/provider/Settings.java

+17 −0
Original line number Diff line number Diff line
@@ -10840,6 +10840,23 @@ public final class Settings { 
        public static final String ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED =

                "accessibility_software_cursor_enabled";













        /**













         * Software Cursor settings that specifies whether trigger hints are enabled.













         *













         * @hide













         */













        public static final String ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED =













                "accessibility_software_cursor_trigger_hints_enabled";

























        /**













         * Software Cursor settings that specifies whether triggers are shifted when the keyboard













         * is shown.













         *













         * @hide













         */













        public static final String ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED =













                "accessibility_software_cursor_keyboard_shift_enabled";



























        /**















         * Whether the Adaptive connectivity option is enabled.















         *

































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



+8
−0




























Original line number
Diff line number
Diff line








@@ -89,6 +89,14 @@ message SecureSettingsProto {













        // Setting for accessibility magnification for following typing.















        optional SettingProto accessibility_magnification_follow_typing_enabled = 43 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto accessibility_software_cursor_enabled = 44 [ (android.privacy).dest = DEST_AUTOMATIC ];



























        message SoftwareCursorSettings {













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













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













        }



























        optional SoftwareCursorSettings accessibility_software_cursor_settings = 45 [ (android.privacy).dest = DEST_AUTOMATIC ];





























    }















    optional Accessibility accessibility = 2;

















































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



+3
−1




























Original line number
Diff line number
Diff line








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













        Settings.Secure.STATUS_BAR_SHOW_VIBRATE_ICON,















        Settings.Secure.WEAR_TALKBACK_ENABLED,















        Settings.Secure.HBM_SETTING_KEY,













        Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED













        Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED,













        Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED,













        Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED,















    };















}
























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



+4
−0




























Original line number
Diff line number
Diff line








@@ -346,5 +346,9 @@ public class SecureSettingsValidators {













        VALIDATORS.put(Secure.WEAR_TALKBACK_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.HBM_SETTING_KEY, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(













                Secure.ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(













                Secure.ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED, BOOLEAN_VALIDATOR);















    }















}
























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



+6
−0




























Original line number
Diff line number
Diff line








@@ -1828,6 +1828,12 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED,















                SecureSettingsProto.Accessibility.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED);













        dumpSetting(s, p,













                Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED,













                SecureSettingsProto.Accessibility.SoftwareCursorSettings.TRIGGER_HINTS_ENABLED);













        dumpSetting(s, p,













                Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED,













                SecureSettingsProto.Accessibility.SoftwareCursorSettings.KEYBOARD_SHIFT_ENABLED);















        p.end(accessibilityToken);































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