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

Commit 70686c17 authored by Longbo Wei's avatar Longbo Wei
Browse files

a11y: Remember and restore panel's position. 

before: http://shortn/_UhMznN659Y
after:  http://shortn/_kOUOTJ4Ykc

Bug: 395884029
Test: AutoclickControllerTest
Flag: com.android.server.accessibility.enable_autoclick_indicator
Change-Id: I35bc10ec153363ecadf55f6e210811644e497a15
parent ca8ecbeb

core/java/android/provider/Settings.java

+12 −0
Original line number Diff line number Diff line
@@ -9344,6 +9344,18 @@ public final class Settings { 
        public static final String ACCESSIBILITY_AUTOCLICK_IGNORE_MINOR_CURSOR_MOVEMENT =

                "accessibility_autoclick_ignore_minor_cursor_movement";













        /**













         * String setting that stores the position of the autoclick panel when













         * {@link #ACCESSIBILITY_AUTOCLICK_ENABLED} is set. The position is stored as a













         * comma-separated string containing gravity, x-coordinate, y-coordinate, and corner index.













         * For example, "8388659,15,30,0", where 8388659 means gravity Gravity.START | Gravity.TOP.













         *













         * @see #ACCESSIBILITY_AUTOCLICK_ENABLED













         * @hide













         */













        public static final String ACCESSIBILITY_AUTOCLICK_PANEL_POSITION =













                "accessibility_autoclick_panel_position";



























        /**















         * Whether or not larger size icons are used for the pointer of mouse/trackpad for















         * accessibility.

































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



+1
−0




























Original line number
Diff line number
Diff line








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













        // Settings for accessibility autoclick















        optional SettingProto autoclick_cursor_area_size = 62 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto autoclick_ignore_minor_cursor_movement = 63 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto autoclick_panel_position = 64 [ (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








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













        Settings.Secure.ACCESSIBILITY_AUTOCLICK_IGNORE_MINOR_CURSOR_MOVEMENT,















        Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED,















        Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,













        Settings.Secure.ACCESSIBILITY_AUTOCLICK_PANEL_POSITION,















        Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON,















        Settings.Secure.PREFERRED_TTY_MODE,















        Settings.Secure.ENHANCED_VOICE_PRIVACY_ENABLED,

































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



+1
−0




























Original line number
Diff line number
Diff line








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













                Secure.ACCESSIBILITY_AUTOCLICK_IGNORE_MINOR_CURSOR_MOVEMENT, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ACCESSIBILITY_AUTOCLICK_DELAY, NON_NEGATIVE_INTEGER_VALIDATOR);













        VALIDATORS.put(Secure.ACCESSIBILITY_AUTOCLICK_PANEL_POSITION, ANY_STRING_VALIDATOR);















        VALIDATORS.put(Secure.ACCESSIBILITY_LARGE_POINTER_ICON, BOOLEAN_VALIDATOR);















        VALIDATORS.put(















                Secure.PREFERRED_TTY_MODE,

































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



+2
−0




























Original line number
Diff line number
Diff line








@@ -1727,6 +1727,8 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,















                SecureSettingsProto.Accessibility.AUTOCLICK_DELAY);













        dumpSetting(s, p, Settings.Secure.ACCESSIBILITY_AUTOCLICK_PANEL_POSITION,













                SecureSettingsProto.Accessibility.AUTOCLICK_PANEL_POSITION);















        dumpSetting(s, p,















                Settings.Secure.ACCESSIBILITY_BUTTON_TARGET_COMPONENT,















                SecureSettingsProto.Accessibility.BUTTON_TARGET_COMPONENT);