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

Commit 09d4ff89 authored by Phil Weaver's avatar Phil Weaver Committed by Svetoslav Ganov
Browse files

Remove a11y web flags and associated settings 

Bug: 35707622
Bug: 28322375
Test: Ran a11y cts. Updated those tests in linked CL to
ignore this feature.

Change-Id: I1dccb3ae4e1f4d6bb832ae1b0edd4dad4a54289e
parent b216d0f0

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ package android { 
    field public static final int canControlMagnification = 16844039; // 0x1010507

    field public static final int canPerformGestures = 16844045; // 0x101050d

    field public static final int canRecord = 16844060; // 0x101051c

    field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8

    field public static final deprecated int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8

    field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9

    field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7

    field public static final int canRetrieveWindowContent = 16843653; // 0x1010385
@@ -2837,7 +2837,7 @@ package android.accessibilityservice { 
    field public static final int CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40

    field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10

    field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20

    field public static final int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4

    field public static final deprecated int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4

    field public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 8; // 0x8

    field public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 2; // 0x2

    field public static final int CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT = 1; // 0x1
@@ -2855,7 +2855,7 @@ package android.accessibilityservice { 
    field public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 2; // 0x2

    field public static final int FLAG_REPORT_VIEW_IDS = 16; // 0x10

    field public static final int FLAG_REQUEST_ACCESSIBILITY_BUTTON = 256; // 0x100

    field public static final int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8

    field public static final deprecated int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8

    field public static final int FLAG_REQUEST_FILTER_KEY_EVENTS = 32; // 0x20

    field public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 4; // 0x4

    field public static final int FLAG_RETRIEVE_INTERACTIVE_WINDOWS = 64; // 0x40

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ package android { 
    field public static final int canControlMagnification = 16844039; // 0x1010507

    field public static final int canPerformGestures = 16844045; // 0x101050d

    field public static final int canRecord = 16844060; // 0x101051c

    field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8

    field public static final deprecated int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8

    field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9

    field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7

    field public static final int canRetrieveWindowContent = 16843653; // 0x1010385
@@ -2964,7 +2964,7 @@ package android.accessibilityservice { 
    field public static final int CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40

    field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10

    field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20

    field public static final int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4

    field public static final deprecated int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4

    field public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 8; // 0x8

    field public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 2; // 0x2

    field public static final int CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT = 1; // 0x1
@@ -2982,7 +2982,7 @@ package android.accessibilityservice { 
    field public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 2; // 0x2

    field public static final int FLAG_REPORT_VIEW_IDS = 16; // 0x10

    field public static final int FLAG_REQUEST_ACCESSIBILITY_BUTTON = 256; // 0x100

    field public static final int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8

    field public static final deprecated int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8

    field public static final int FLAG_REQUEST_FILTER_KEY_EVENTS = 32; // 0x20

    field public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 4; // 0x4

    field public static final int FLAG_RETRIEVE_INTERACTIVE_WINDOWS = 64; // 0x40

api/test-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ package android { 
    field public static final int canControlMagnification = 16844039; // 0x1010507

    field public static final int canPerformGestures = 16844045; // 0x101050d

    field public static final int canRecord = 16844060; // 0x101051c

    field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8

    field public static final deprecated int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8

    field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9

    field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7

    field public static final int canRetrieveWindowContent = 16843653; // 0x1010385
@@ -2837,7 +2837,7 @@ package android.accessibilityservice { 
    field public static final int CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40

    field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10

    field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20

    field public static final int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4

    field public static final deprecated int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4

    field public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 8; // 0x8

    field public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 2; // 0x2

    field public static final int CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT = 1; // 0x1
@@ -2855,7 +2855,7 @@ package android.accessibilityservice { 
    field public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 2; // 0x2

    field public static final int FLAG_REPORT_VIEW_IDS = 16; // 0x10

    field public static final int FLAG_REQUEST_ACCESSIBILITY_BUTTON = 256; // 0x100

    field public static final int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8

    field public static final deprecated int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8

    field public static final int FLAG_REQUEST_FILTER_KEY_EVENTS = 32; // 0x20

    field public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 4; // 0x4

    field public static final int FLAG_RETRIEVE_INTERACTIVE_WINDOWS = 64; // 0x40

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+2 −29
Original line number Diff line number Diff line
@@ -95,9 +95,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
    public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 0x00000002;



    /**

     * Capability: This accessibility service can request enhanced web accessibility

     * enhancements. For example, installing scripts to make app content more accessible.

     * @see android.R.styleable#AccessibilityService_canRequestEnhancedWebAccessibility

     * @deprecated No longer used

     */

    public static final int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 0x00000004;
@@ -237,22 +235,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
    public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 0x0000004;



    /**

     * This flag requests from the system to enable web accessibility enhancing

     * extensions. Such extensions aim to provide improved accessibility support

     * for content presented in a {@link android.webkit.WebView}. An example of such

     * an extension is injecting JavaScript from a secure source. The system will enable

     * enhanced web accessibility if there is at least one accessibility service

     * that has this flag set. Hence, clearing this flag does not guarantee that the

     * device will not have enhanced web accessibility enabled since there may be

     * another enabled service that requested it.

     * <p>

     * Services that want to set this flag have to declare this capability

     * in their meta-data by setting the attribute {@link android.R.attr

     * #canRequestEnhancedWebAccessibility canRequestEnhancedWebAccessibility} to

     * true, otherwise this flag will be ignored. For how to declare the meta-data

     * of a service refer to {@value AccessibilityService#SERVICE_META_DATA}.

     * </p>

     * @see android.R.styleable#AccessibilityService_canRequestEnhancedWebAccessibility

     * @deprecated No longer used

     */

    public static final int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 0x00000008;
@@ -525,10 +508,6 @@ public class AccessibilityServiceInfo implements Parcelable { 
                    .AccessibilityService_canRequestTouchExplorationMode, false)) {

                mCapabilities |= CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION;

            }

            if (asAttributes.getBoolean(com.android.internal.R.styleable

                        .AccessibilityService_canRequestEnhancedWebAccessibility, false)) {

                    mCapabilities |= CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY;

            }

            if (asAttributes.getBoolean(com.android.internal.R.styleable

                    .AccessibilityService_canRequestFilterKeyEvents, false)) {

                mCapabilities |= CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS;
@@ -659,7 +638,6 @@ public class AccessibilityServiceInfo implements Parcelable { 
     *

     * @see #CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT

     * @see #CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION

     * @see #CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY

     * @see #CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS

     * @see #CAPABILITY_CAN_CONTROL_MAGNIFICATION

     * @see #CAPABILITY_CAN_PERFORM_GESTURES
@@ -676,7 +654,6 @@ public class AccessibilityServiceInfo implements Parcelable { 
     *

     * @see #CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT

     * @see #CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION

     * @see #CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY

     * @see #CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS

     * @see #CAPABILITY_CAN_CONTROL_MAGNIFICATION

     * @see #CAPABILITY_CAN_PERFORM_GESTURES
@@ -1074,10 +1051,6 @@ public class AccessibilityServiceInfo implements Parcelable { 
                    new CapabilityInfo(CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION,

                            R.string.capability_title_canRequestTouchExploration,

                            R.string.capability_desc_canRequestTouchExploration));

            sAvailableCapabilityInfos.put(CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY,

                    new CapabilityInfo(CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY,

                            R.string.capability_title_canRequestEnhancedWebAccessibility,

                            R.string.capability_desc_canRequestEnhancedWebAccessibility));

            sAvailableCapabilityInfos.put(CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS,

                    new CapabilityInfo(CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS,

                            R.string.capability_title_canRequestFilterKeyEvents,

core/java/android/provider/Settings.java

+0 −72
Original line number Diff line number Diff line
@@ -5554,76 +5554,6 @@ public final class Settings { 
        public static final String ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED =

                "high_text_contrast_enabled";



        /**

         * If injection of accessibility enhancing JavaScript screen-reader

         * is enabled.

         * <p>

         *   Note: The JavaScript based screen-reader is served by the

         *   Google infrastructure and enable users with disabilities to

         *   efficiently navigate in and explore web content.

         * </p>

         * <p>

         *   This property represents a boolean value.

         * </p>

         * @hide

         */

        public static final String ACCESSIBILITY_SCRIPT_INJECTION =

            "accessibility_script_injection";



        /**

         * The URL for the injected JavaScript based screen-reader used

         * for providing accessibility of content in WebView.

         * <p>

         *   Note: The JavaScript based screen-reader is served by the

         *   Google infrastructure and enable users with disabilities to

         *   efficiently navigate in and explore web content.

         * </p>

         * <p>

         *   This property represents a string value.

         * </p>

         * @hide

         */

        public static final String ACCESSIBILITY_SCREEN_READER_URL =

            "accessibility_script_injection_url";



        /**

         * Key bindings for navigation in built-in accessibility support for web content.

         * <p>

         *   Note: These key bindings are for the built-in accessibility navigation for

         *   web content which is used as a fall back solution if JavaScript in a WebView

         *   is not enabled or the user has not opted-in script injection from Google.

         * </p>

         * <p>

         *   The bindings are separated by semi-colon. A binding is a mapping from

         *   a key to a sequence of actions (for more details look at

         *   android.webkit.AccessibilityInjector). A key is represented as the hexademical

         *   string representation of an integer obtained from a meta state (optional) shifted

         *   sixteen times left and bitwise ored with a key code. An action is represented

         *   as a hexademical string representation of an integer where the first two digits

         *   are navigation action index, the second, the third, and the fourth digit pairs

         *   represent the action arguments. The separate actions in a binding are colon

         *   separated. The key and the action sequence it maps to are separated by equals.

         * </p>

         * <p>

         *   For example, the binding below maps the DPAD right button to traverse the

         *   current navigation axis once without firing an accessibility event and to

         *   perform the same traversal again but to fire an event:

         *   <code>

         *     0x16=0x01000100:0x01000101;

         *   </code>

         * </p>

         * <p>

         *   The goal of this binding is to enable dynamic rebinding of keys to

         *   navigation actions for web content without requiring a framework change.

         * </p>

         * <p>

         *   This property represents a string value.

         * </p>

         * @hide

         */

        public static final String ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS =

            "accessibility_web_content_key_bindings";



        /**

         * Setting that specifies whether the display magnification is enabled via a system-wide

         * triple tap gesture. Display magnifications allows the user to zoom in the display content
@@ -6994,8 +6924,6 @@ public final class Settings { 
            ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,

            ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED,

            ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,

            ACCESSIBILITY_SCRIPT_INJECTION,

            ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS,

            ENABLED_ACCESSIBILITY_SERVICES,

            ENABLED_NOTIFICATION_LISTENERS,

            ENABLED_VR_LISTENERS,