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

Commit 1d46f8bb authored by Mark Schillaci's avatar Mark Schillaci Committed by Android (Google) Code Review
Browse files

Merge "Update hex numbers in Accessibility code to use bit shift"

parents b8427fbb 1b3edccd

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+33 −31
Original line number Diff line number Diff line
@@ -107,81 +107,82 @@ public class AccessibilityServiceInfo implements Parcelable { 
     * Capability: This accessibility service can retrieve the active window content.

     * @see android.R.styleable#AccessibilityService_canRetrieveWindowContent

     */

    public static final int CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT = 0x00000001;

    public static final int CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT = 1 /* << 0 */;



    /**

     * Capability: This accessibility service can request touch exploration mode in which

     * touched items are spoken aloud and the UI can be explored via gestures.

     * @see android.R.styleable#AccessibilityService_canRequestTouchExplorationMode

     */

    public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 0x00000002;

    public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 1 << 1;



    /**

     * @deprecated No longer used

     */

    public static final int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 0x00000004;

    @Deprecated

    public static final int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 1 << 2;



    /**

     * Capability: This accessibility service can request to filter the key event stream.

     * @see android.R.styleable#AccessibilityService_canRequestFilterKeyEvents

     */

    public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 0x00000008;

    public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 1 << 3;



    /**

     * Capability: This accessibility service can control display magnification.

     * @see android.R.styleable#AccessibilityService_canControlMagnification

     */

    public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 0x00000010;

    public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 1 << 4;



    /**

     * Capability: This accessibility service can perform gestures.

     * @see android.R.styleable#AccessibilityService_canPerformGestures

     */

    public static final int CAPABILITY_CAN_PERFORM_GESTURES = 0x00000020;

    public static final int CAPABILITY_CAN_PERFORM_GESTURES = 1 << 5;



    /**

     * Capability: This accessibility service can capture gestures from the fingerprint sensor

     * @see android.R.styleable#AccessibilityService_canRequestFingerprintGestures

     */

    public static final int CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES = 0x00000040;

    public static final int CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES = 1 << 6;



    /**

     * Capability: This accessibility service can take screenshot.

     * @see android.R.styleable#AccessibilityService_canTakeScreenshot

     */

    public static final int CAPABILITY_CAN_TAKE_SCREENSHOT = 0x00000080;

    public static final int CAPABILITY_CAN_TAKE_SCREENSHOT = 1 << 7;



    private static SparseArray<CapabilityInfo> sAvailableCapabilityInfos;



    /**

     * Denotes spoken feedback.

     */

    public static final int FEEDBACK_SPOKEN = 0x0000001;

    public static final int FEEDBACK_SPOKEN = 1 /* << 0 */;



    /**

     * Denotes haptic feedback.

     */

    public static final int FEEDBACK_HAPTIC =  0x0000002;

    public static final int FEEDBACK_HAPTIC =  1 << 1;



    /**

     * Denotes audible (not spoken) feedback.

     */

    public static final int FEEDBACK_AUDIBLE = 0x0000004;

    public static final int FEEDBACK_AUDIBLE = 1 << 2;



    /**

     * Denotes visual feedback.

     */

    public static final int FEEDBACK_VISUAL = 0x0000008;

    public static final int FEEDBACK_VISUAL = 1 << 3;



    /**

     * Denotes generic feedback.

     */

    public static final int FEEDBACK_GENERIC = 0x0000010;

    public static final int FEEDBACK_GENERIC = 1 << 4;



    /**

     * Denotes braille feedback.

     */

    public static final int FEEDBACK_BRAILLE = 0x0000020;

    public static final int FEEDBACK_BRAILLE = 1 << 5;



    /**

     * Mask for all feedback types.
@@ -200,7 +201,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
     * Default service is invoked only if no package specific one exists. In case of

     * more than one package specific service only the earlier registered is notified.

     */

    public static final int DEFAULT = 0x0000001;

    public static final int DEFAULT = 1 /* << 0 */;



    /**

     * If this flag is set the system will regard views that are not important
@@ -230,7 +231,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
     * elements.

     * </p>

     */

    public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 0x0000002;

    public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 1 << 1;



    /**

     * This flag requests that the system gets into touch exploration mode.
@@ -258,12 +259,13 @@ public class AccessibilityServiceInfo implements Parcelable { 
     * </p>

     * @see android.R.styleable#AccessibilityService_canRequestTouchExplorationMode

     */

    public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 0x0000004;

    public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 1 << 2;



    /**

     * @deprecated No longer used

     */

    public static final int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 0x00000008;

    @Deprecated

    public static final int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 1 << 3;



    /**

     * This flag requests that the {@link AccessibilityNodeInfo}s obtained
@@ -272,7 +274,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
     * form "package:id/name", for example "foo.bar:id/my_list", and it is

     * useful for UI test automation. This flag is not set by default.

     */

    public static final int FLAG_REPORT_VIEW_IDS = 0x00000010;

    public static final int FLAG_REPORT_VIEW_IDS = 1 << 4;



    /**

     * This flag requests from the system to filter key events. If this flag
@@ -287,7 +289,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
     * </p>

     * @see android.R.styleable#AccessibilityService_canRequestFilterKeyEvents

     */

    public static final int FLAG_REQUEST_FILTER_KEY_EVENTS = 0x00000020;

    public static final int FLAG_REQUEST_FILTER_KEY_EVENTS = 1 << 5;



    /**

     * This flag indicates to the system that the accessibility service wants
@@ -308,14 +310,14 @@ public class AccessibilityServiceInfo implements Parcelable { 
     * </p>

     * @see android.R.styleable#AccessibilityService_canRetrieveWindowContent

     */

    public static final int FLAG_RETRIEVE_INTERACTIVE_WINDOWS = 0x00000040;

    public static final int FLAG_RETRIEVE_INTERACTIVE_WINDOWS = 1 << 6;



    /**

     * This flag requests that all audio tracks system-wide with

     * {@link android.media.AudioAttributes#USAGE_ASSISTANCE_ACCESSIBILITY} be controlled by the

     * {@link android.media.AudioManager#STREAM_ACCESSIBILITY} volume.

     */

    public static final int FLAG_ENABLE_ACCESSIBILITY_VOLUME = 0x00000080;

    public static final int FLAG_ENABLE_ACCESSIBILITY_VOLUME = 1 << 7;



     /**

     * This flag indicates to the system that the accessibility service requests that an
@@ -326,7 +328,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
      *   accessibility service metadata file. Otherwise, it will be ignored.

      * </p>

     */

    public static final int FLAG_REQUEST_ACCESSIBILITY_BUTTON = 0x00000100;

    public static final int FLAG_REQUEST_ACCESSIBILITY_BUTTON = 1 << 8;



    /**

     * This flag requests that all fingerprint gestures be sent to the accessibility service.
@@ -341,13 +343,13 @@ public class AccessibilityServiceInfo implements Parcelable { 
     * @see android.R.styleable#AccessibilityService_canRequestFingerprintGestures

     * @see AccessibilityService#getFingerprintGestureController()

     */

    public static final int FLAG_REQUEST_FINGERPRINT_GESTURES = 0x00000200;

    public static final int FLAG_REQUEST_FINGERPRINT_GESTURES = 1 << 9;



    /**

     * This flag requests that accessibility shortcut warning dialog has spoken feedback when

     * dialog is shown.

     */

    public static final int FLAG_REQUEST_SHORTCUT_WARNING_DIALOG_SPOKEN_FEEDBACK = 0x00000400;

    public static final int FLAG_REQUEST_SHORTCUT_WARNING_DIALOG_SPOKEN_FEEDBACK = 1 << 10;



    /**

     * This flag requests that when {@link #FLAG_REQUEST_TOUCH_EXPLORATION_MODE} is enabled,
@@ -357,7 +359,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
     *

     * @see #FLAG_REQUEST_TOUCH_EXPLORATION_MODE

     */

    public static final int FLAG_SERVICE_HANDLES_DOUBLE_TAP = 0x0000800;

    public static final int FLAG_SERVICE_HANDLES_DOUBLE_TAP = 1 << 11;



    /**

     * This flag requests that when when {@link #FLAG_REQUEST_TOUCH_EXPLORATION_MODE} is enabled,
@@ -367,7 +369,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
     *

     * @see #FLAG_REQUEST_TOUCH_EXPLORATION_MODE

     */

    public static final int FLAG_REQUEST_MULTI_FINGER_GESTURES = 0x0001000;

    public static final int FLAG_REQUEST_MULTI_FINGER_GESTURES = 1 << 12;



    /**

     * This flag requests that when when {@link #FLAG_REQUEST_MULTI_FINGER_GESTURES} is enabled,
@@ -378,7 +380,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
     *

     * @see #FLAG_REQUEST_TOUCH_EXPLORATION_MODE

     */

    public static final int FLAG_REQUEST_2_FINGER_PASSTHROUGH = 0x0002000;

    public static final int FLAG_REQUEST_2_FINGER_PASSTHROUGH = 1 << 13;



    /**

     * This flag requests that when when {@link #FLAG_REQUEST_TOUCH_EXPLORATION_MODE} is enabled, a
@@ -392,7 +394,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
     *

     * @see #FLAG_REQUEST_TOUCH_EXPLORATION_MODE

     */

    public static final int FLAG_SEND_MOTION_EVENTS = 0x0004000;

    public static final int FLAG_SEND_MOTION_EVENTS = 1 << 14;



    /**

     * This flag makes the AccessibilityService an input method editor with a subset of input
@@ -401,10 +403,10 @@ public class AccessibilityServiceInfo implements Parcelable { 
     *

     * @see AccessibilityService#getInputMethod()

     */

    public static final int FLAG_INPUT_METHOD_EDITOR = 0x0008000;

    public static final int FLAG_INPUT_METHOD_EDITOR = 1 << 15;



    /** {@hide} */

    public static final int FLAG_FORCE_DIRECT_BOOT_AWARE = 0x00010000;

    public static final int FLAG_FORCE_DIRECT_BOOT_AWARE = 1 << 16;



    /**

     * The event types an {@link AccessibilityService} is interested in.

core/java/android/view/accessibility/AccessibilityEvent.java

+110 −60

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/accessibility/AccessibilityManager.java

+10 −10
Original line number Diff line number Diff line
@@ -99,30 +99,30 @@ public final class AccessibilityManager { 
    private static final String LOG_TAG = "AccessibilityManager";



    /** @hide */

    public static final int STATE_FLAG_ACCESSIBILITY_ENABLED = 0x00000001;

    public static final int STATE_FLAG_ACCESSIBILITY_ENABLED = 1 /* << 0 */;



    /** @hide */

    public static final int STATE_FLAG_TOUCH_EXPLORATION_ENABLED = 0x00000002;

    public static final int STATE_FLAG_TOUCH_EXPLORATION_ENABLED = 1 << 1;



    /** @hide */

    public static final int STATE_FLAG_HIGH_TEXT_CONTRAST_ENABLED = 0x00000004;

    public static final int STATE_FLAG_HIGH_TEXT_CONTRAST_ENABLED = 1 << 2;



    /** @hide */

    public static final int STATE_FLAG_DISPATCH_DOUBLE_TAP = 0x00000008;

    public static final int STATE_FLAG_DISPATCH_DOUBLE_TAP = 1 << 3;



    /** @hide */

    public static final int STATE_FLAG_REQUEST_MULTI_FINGER_GESTURES = 0x00000010;

    public static final int STATE_FLAG_REQUEST_MULTI_FINGER_GESTURES = 1 << 4;



    /** @hide */

    public static final int STATE_FLAG_TRACE_A11Y_INTERACTION_CONNECTION_ENABLED = 0x00000100;

    public static final int STATE_FLAG_TRACE_A11Y_INTERACTION_CONNECTION_ENABLED = 1 << 8;

    /** @hide */

    public static final int STATE_FLAG_TRACE_A11Y_INTERACTION_CONNECTION_CB_ENABLED = 0x00000200;

    public static final int STATE_FLAG_TRACE_A11Y_INTERACTION_CONNECTION_CB_ENABLED = 1 << 9;

    /** @hide */

    public static final int STATE_FLAG_TRACE_A11Y_INTERACTION_CLIENT_ENABLED = 0x00000400;

    public static final int STATE_FLAG_TRACE_A11Y_INTERACTION_CLIENT_ENABLED = 1 << 10;

    /** @hide */

    public static final int STATE_FLAG_TRACE_A11Y_SERVICE_ENABLED = 0x00000800;

    public static final int STATE_FLAG_TRACE_A11Y_SERVICE_ENABLED = 1 << 11;

    /** @hide */

    public static final int STATE_FLAG_AUDIO_DESCRIPTION_BY_DEFAULT_ENABLED = 0x00001000;

    public static final int STATE_FLAG_AUDIO_DESCRIPTION_BY_DEFAULT_ENABLED = 1 << 12;



    /** @hide */

    public static final int DALTONIZER_DISABLED = -1;

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+70 −64
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ public class AccessibilityNodeInfo implements Parcelable { 
    public static final long LEASHED_NODE_ID = makeNodeId(LEASHED_ITEM_ID,

            AccessibilityNodeProvider.HOST_VIEW_ID);



    // Prefetch flags.



    /**

     * Prefetching strategy that prefetches the ancestors of the requested node.

     * <p> Ancestors will be prefetched before siblings and descendants.
@@ -146,7 +148,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     * @see AccessibilityService#getRootInActiveWindow(int)

     * @see AccessibilityEvent#getSource(int)

     */

    public static final int FLAG_PREFETCH_ANCESTORS = 0x00000001;

    public static final int FLAG_PREFETCH_ANCESTORS = 1 /* << 0 */;



    /**

     * Prefetching strategy that prefetches the siblings of the requested node.
@@ -155,7 +157,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     *

     * @see #FLAG_PREFETCH_ANCESTORS for where to use these flags.

     */

    public static final int FLAG_PREFETCH_SIBLINGS = 0x00000002;

    public static final int FLAG_PREFETCH_SIBLINGS = 1 << 1;



    /**

     * Prefetching strategy that prefetches the descendants in a hybrid depth first and breadth
@@ -167,7 +169,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     *

     * @see #FLAG_PREFETCH_ANCESTORS for where to use these flags.

     */

    public static final int FLAG_PREFETCH_DESCENDANTS_HYBRID = 0x00000004;

    public static final int FLAG_PREFETCH_DESCENDANTS_HYBRID = 1 << 2;



    /**

     * Prefetching strategy that prefetches the descendants of the requested node depth-first.
@@ -177,7 +179,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     *

     * @see #FLAG_PREFETCH_ANCESTORS for where to use these flags.

     */

    public static final int FLAG_PREFETCH_DESCENDANTS_DEPTH_FIRST = 0x00000008;

    public static final int FLAG_PREFETCH_DESCENDANTS_DEPTH_FIRST = 1 << 3;



    /**

     * Prefetching strategy that prefetches the descendants of the requested node breadth-first.
@@ -187,7 +189,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     *

     * @see #FLAG_PREFETCH_ANCESTORS for where to use these flags.

     */

    public static final int FLAG_PREFETCH_DESCENDANTS_BREADTH_FIRST = 0x00000010;

    public static final int FLAG_PREFETCH_DESCENDANTS_BREADTH_FIRST = 1 << 4;



    /**

     * Prefetching flag that specifies prefetching should not be interrupted by a request to
@@ -195,7 +197,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     *

     * @see #FLAG_PREFETCH_ANCESTORS for where to use these flags.

     */

    public static final int FLAG_PREFETCH_UNINTERRUPTIBLE = 0x00000020;

    public static final int FLAG_PREFETCH_UNINTERRUPTIBLE = 1 << 5;



    /** @hide */

    public static final int FLAG_PREFETCH_MASK = 0x0000003f;
@@ -210,6 +212,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
    public static final int MAX_NUMBER_OF_PREFETCHED_NODES = 50;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(flag = true, prefix = { "FLAG_PREFETCH" }, value = {

            FLAG_PREFETCH_ANCESTORS,

            FLAG_PREFETCH_SIBLINGS,
@@ -218,26 +221,27 @@ public class AccessibilityNodeInfo implements Parcelable { 
            FLAG_PREFETCH_DESCENDANTS_BREADTH_FIRST,

            FLAG_PREFETCH_UNINTERRUPTIBLE

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface PrefetchingStrategy {}



    // Service flags.



    /**

     * @see AccessibilityServiceInfo#FLAG_INCLUDE_NOT_IMPORTANT_VIEWS

     * @hide

     */

    public static final int FLAG_SERVICE_REQUESTS_INCLUDE_NOT_IMPORTANT_VIEWS = 0x00000080;

    public static final int FLAG_SERVICE_REQUESTS_INCLUDE_NOT_IMPORTANT_VIEWS = 1 << 7;



    /**

     * @see AccessibilityServiceInfo#FLAG_REPORT_VIEW_IDS

     * @hide

     */

    public static final int FLAG_SERVICE_REQUESTS_REPORT_VIEW_IDS = 0x00000100;

    public static final int FLAG_SERVICE_REQUESTS_REPORT_VIEW_IDS = 1 << 8;



    /**

     * @see AccessibilityServiceInfo#isAccessibilityTool()

     * @hide

     */

    public static final int FLAG_SERVICE_IS_ACCESSIBILITY_TOOL = 0x00000200;

    public static final int FLAG_SERVICE_IS_ACCESSIBILITY_TOOL = 1 << 9;



    /** @hide */

    public static final int FLAG_REPORT_MASK =
@@ -250,46 +254,46 @@ public class AccessibilityNodeInfo implements Parcelable { 
    /**

     * Action that gives input focus to the node.

     */

    public static final int ACTION_FOCUS =  0x00000001;

    public static final int ACTION_FOCUS =  1 /* << 0 */;



    /**

     * Action that clears input focus of the node.

     */

    public static final int ACTION_CLEAR_FOCUS = 0x00000002;

    public static final int ACTION_CLEAR_FOCUS = 1 << 1;



    /**

     * Action that selects the node.

     */

    public static final int ACTION_SELECT = 0x00000004;

    public static final int ACTION_SELECT = 1 << 2;



    /**

     * Action that deselects the node.

     */

    public static final int ACTION_CLEAR_SELECTION = 0x00000008;

    public static final int ACTION_CLEAR_SELECTION = 1 << 3;



    /**

     * Action that clicks on the node info.

     *

     * See {@link AccessibilityAction#ACTION_CLICK}

     */

    public static final int ACTION_CLICK = 0x00000010;

    public static final int ACTION_CLICK = 1 << 4;



    /**

     * Action that long clicks on the node.

     *

     * <p>It does not support coordinate information for anchoring.</p>

     */

    public static final int ACTION_LONG_CLICK = 0x00000020;

    public static final int ACTION_LONG_CLICK = 1 << 5;



    /**

     * Action that gives accessibility focus to the node.

     */

    public static final int ACTION_ACCESSIBILITY_FOCUS = 0x00000040;

    public static final int ACTION_ACCESSIBILITY_FOCUS = 1 << 6;



    /**

     * Action that clears accessibility focus of the node.

     */

    public static final int ACTION_CLEAR_ACCESSIBILITY_FOCUS = 0x00000080;

    public static final int ACTION_CLEAR_ACCESSIBILITY_FOCUS = 1 << 7;



    /**

     * Action that requests to go to the next entity in this node's text
@@ -321,7 +325,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     * @see #MOVEMENT_GRANULARITY_PARAGRAPH

     * @see #MOVEMENT_GRANULARITY_PAGE

     */

    public static final int ACTION_NEXT_AT_MOVEMENT_GRANULARITY = 0x00000100;

    public static final int ACTION_NEXT_AT_MOVEMENT_GRANULARITY = 1 << 8;



    /**

     * Action that requests to go to the previous entity in this node's text
@@ -354,7 +358,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     * @see #MOVEMENT_GRANULARITY_PARAGRAPH

     * @see #MOVEMENT_GRANULARITY_PAGE

     */

    public static final int ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY = 0x00000200;

    public static final int ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY = 1 << 9;



    /**

     * Action to move to the next HTML element of a given type. For example, move
@@ -369,7 +373,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     * </code></pre></p>

     * </p>

     */

    public static final int ACTION_NEXT_HTML_ELEMENT = 0x00000400;

    public static final int ACTION_NEXT_HTML_ELEMENT = 1 << 10;



    /**

     * Action to move to the previous HTML element of a given type. For example, move
@@ -384,32 +388,32 @@ public class AccessibilityNodeInfo implements Parcelable { 
     * </code></pre></p>

     * </p>

     */

    public static final int ACTION_PREVIOUS_HTML_ELEMENT = 0x00000800;

    public static final int ACTION_PREVIOUS_HTML_ELEMENT = 1 << 11;



    /**

     * Action to scroll the node content forward.

     */

    public static final int ACTION_SCROLL_FORWARD = 0x00001000;

    public static final int ACTION_SCROLL_FORWARD = 1 << 12;



    /**

     * Action to scroll the node content backward.

     */

    public static final int ACTION_SCROLL_BACKWARD = 0x00002000;

    public static final int ACTION_SCROLL_BACKWARD = 1 << 13;



    /**

     * Action to copy the current selection to the clipboard.

     */

    public static final int ACTION_COPY = 0x00004000;

    public static final int ACTION_COPY = 1 << 14;



    /**

     * Action to paste the current clipboard content.

     */

    public static final int ACTION_PASTE = 0x00008000;

    public static final int ACTION_PASTE = 1 << 15;



    /**

     * Action to cut the current selection and place it to the clipboard.

     */

    public static final int ACTION_CUT = 0x00010000;

    public static final int ACTION_CUT = 1 << 16;



    /**

     * Action to set the selection. Performing this action with no arguments
@@ -430,22 +434,22 @@ public class AccessibilityNodeInfo implements Parcelable { 
     * @see #ACTION_ARGUMENT_SELECTION_START_INT

     * @see #ACTION_ARGUMENT_SELECTION_END_INT

     */

    public static final int ACTION_SET_SELECTION = 0x00020000;

    public static final int ACTION_SET_SELECTION = 1 << 17;



    /**

     * Action to expand an expandable node.

     */

    public static final int ACTION_EXPAND = 0x00040000;

    public static final int ACTION_EXPAND = 1 << 18;



    /**

     * Action to collapse an expandable node.

     */

    public static final int ACTION_COLLAPSE = 0x00080000;

    public static final int ACTION_COLLAPSE = 1 << 19;



    /**

     * Action to dismiss a dismissable node.

     */

    public static final int ACTION_DISMISS = 0x00100000;

    public static final int ACTION_DISMISS = 1 << 20;



    /**

     * Action that sets the text of the node. Performing the action without argument, using <code>
@@ -462,7 +466,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     *   info.performAction(AccessibilityNodeInfo.ACTION_SET_TEXT, arguments);

     * </code></pre></p>

     */

    public static final int ACTION_SET_TEXT = 0x00200000;

    public static final int ACTION_SET_TEXT = 1 << 21;



    /** @hide */

    public static final int LAST_LEGACY_STANDARD_ACTION = ACTION_SET_TEXT;
@@ -472,7 +476,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     */

    private static final int ACTION_TYPE_MASK = 0xFF000000;



    // Action arguments

    // Action arguments.



    /**

     * Argument for which movement granularity to be used when traversing the node text.
@@ -678,7 +682,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
    public static final String ACTION_ARGUMENT_DIRECTION_INT =

            "android.view.accessibility.action.ARGUMENT_DIRECTION_INT";



    // Focus types

    // Focus types.



    /**

     * The input focus.
@@ -690,32 +694,34 @@ public class AccessibilityNodeInfo implements Parcelable { 
     */

    public static final int FOCUS_ACCESSIBILITY = 2;



    // Movement granularities

    // Movement granularities.



    /**

     * Movement granularity bit for traversing the text of a node by character.

     */

    public static final int MOVEMENT_GRANULARITY_CHARACTER = 0x00000001;

    public static final int MOVEMENT_GRANULARITY_CHARACTER = 1 /* << 0 */;



    /**

     * Movement granularity bit for traversing the text of a node by word.

     */

    public static final int MOVEMENT_GRANULARITY_WORD = 0x00000002;

    public static final int MOVEMENT_GRANULARITY_WORD = 1 << 1;



    /**

     * Movement granularity bit for traversing the text of a node by line.

     */

    public static final int MOVEMENT_GRANULARITY_LINE = 0x00000004;

    public static final int MOVEMENT_GRANULARITY_LINE = 1 << 2;



    /**

     * Movement granularity bit for traversing the text of a node by paragraph.

     */

    public static final int MOVEMENT_GRANULARITY_PARAGRAPH = 0x00000008;

    public static final int MOVEMENT_GRANULARITY_PARAGRAPH = 1 << 3;



    /**

     * Movement granularity bit for traversing the text of a node by page.

     */

    public static final int MOVEMENT_GRANULARITY_PAGE = 0x00000010;

    public static final int MOVEMENT_GRANULARITY_PAGE = 1 << 4;



    // Extra data arguments.



    /**

     * Key used to request and locate extra data for text character location. This key requests that
@@ -782,53 +788,53 @@ public class AccessibilityNodeInfo implements Parcelable { 


    // Boolean attributes.



    private static final int BOOLEAN_PROPERTY_CHECKABLE = 0x00000001;

    private static final int BOOLEAN_PROPERTY_CHECKABLE = 1 /* << 0 */;



    private static final int BOOLEAN_PROPERTY_CHECKED = 0x00000002;

    private static final int BOOLEAN_PROPERTY_CHECKED = 1 << 1;



    private static final int BOOLEAN_PROPERTY_FOCUSABLE = 0x00000004;

    private static final int BOOLEAN_PROPERTY_FOCUSABLE = 1 << 2;



    private static final int BOOLEAN_PROPERTY_FOCUSED = 0x00000008;

    private static final int BOOLEAN_PROPERTY_FOCUSED = 1 << 3;



    private static final int BOOLEAN_PROPERTY_SELECTED = 0x00000010;

    private static final int BOOLEAN_PROPERTY_SELECTED = 1 << 4;



    private static final int BOOLEAN_PROPERTY_CLICKABLE = 0x00000020;

    private static final int BOOLEAN_PROPERTY_CLICKABLE = 1 << 5;



    private static final int BOOLEAN_PROPERTY_LONG_CLICKABLE = 0x00000040;

    private static final int BOOLEAN_PROPERTY_LONG_CLICKABLE = 1 << 6;



    private static final int BOOLEAN_PROPERTY_ENABLED = 0x00000080;

    private static final int BOOLEAN_PROPERTY_ENABLED = 1 << 7;



    private static final int BOOLEAN_PROPERTY_PASSWORD = 0x00000100;

    private static final int BOOLEAN_PROPERTY_PASSWORD = 1 << 8;



    private static final int BOOLEAN_PROPERTY_SCROLLABLE = 0x00000200;

    private static final int BOOLEAN_PROPERTY_SCROLLABLE = 1 << 9;



    private static final int BOOLEAN_PROPERTY_ACCESSIBILITY_FOCUSED = 0x00000400;

    private static final int BOOLEAN_PROPERTY_ACCESSIBILITY_FOCUSED = 1 << 10;



    private static final int BOOLEAN_PROPERTY_VISIBLE_TO_USER = 0x00000800;

    private static final int BOOLEAN_PROPERTY_VISIBLE_TO_USER = 1 << 11;



    private static final int BOOLEAN_PROPERTY_EDITABLE = 0x00001000;

    private static final int BOOLEAN_PROPERTY_EDITABLE = 1 << 12;



    private static final int BOOLEAN_PROPERTY_OPENS_POPUP = 0x00002000;

    private static final int BOOLEAN_PROPERTY_OPENS_POPUP = 1 << 13;



    private static final int BOOLEAN_PROPERTY_DISMISSABLE = 0x00004000;

    private static final int BOOLEAN_PROPERTY_DISMISSABLE = 1 << 14;



    private static final int BOOLEAN_PROPERTY_MULTI_LINE = 0x00008000;

    private static final int BOOLEAN_PROPERTY_MULTI_LINE = 1 << 15;



    private static final int BOOLEAN_PROPERTY_CONTENT_INVALID = 0x00010000;

    private static final int BOOLEAN_PROPERTY_CONTENT_INVALID = 1 << 16;



    private static final int BOOLEAN_PROPERTY_CONTEXT_CLICKABLE = 0x00020000;

    private static final int BOOLEAN_PROPERTY_CONTEXT_CLICKABLE = 1 << 17;



    private static final int BOOLEAN_PROPERTY_IMPORTANCE = 0x0040000;

    private static final int BOOLEAN_PROPERTY_IMPORTANCE = 1 << 18;



    private static final int BOOLEAN_PROPERTY_SCREEN_READER_FOCUSABLE = 0x0080000;

    private static final int BOOLEAN_PROPERTY_SCREEN_READER_FOCUSABLE = 1 << 19;



    private static final int BOOLEAN_PROPERTY_IS_SHOWING_HINT = 0x0100000;

    private static final int BOOLEAN_PROPERTY_IS_SHOWING_HINT = 1 << 20;



    private static final int BOOLEAN_PROPERTY_IS_HEADING = 0x0200000;

    private static final int BOOLEAN_PROPERTY_IS_HEADING = 1 << 21;



    private static final int BOOLEAN_PROPERTY_IS_TEXT_ENTRY_KEY = 0x0400000;

    private static final int BOOLEAN_PROPERTY_IS_TEXT_ENTRY_KEY = 1 << 22;



    private static final int BOOLEAN_PROPERTY_IS_TEXT_SELECTABLE = 0x0800000;

    private static final int BOOLEAN_PROPERTY_IS_TEXT_SELECTABLE = 1 << 23;



    private static final int BOOLEAN_PROPERTY_REQUEST_INITIAL_ACCESSIBILITY_FOCUS = 1 << 24;

core/java/android/view/accessibility/AccessibilityRecord.java

+7 −7
Original line number Diff line number Diff line
@@ -66,13 +66,13 @@ public class AccessibilityRecord { 


    private static final int UNDEFINED = -1;



    private static final int PROPERTY_CHECKED = 0x00000001;

    private static final int PROPERTY_ENABLED = 0x00000002;

    private static final int PROPERTY_PASSWORD = 0x00000004;

    private static final int PROPERTY_FULL_SCREEN = 0x00000080;

    private static final int PROPERTY_SCROLLABLE = 0x00000100;

    private static final int PROPERTY_IMPORTANT_FOR_ACCESSIBILITY = 0x00000200;

    private static final int PROPERTY_ACCESSIBILITY_DATA_SENSITIVE = 0x00000400;

    private static final int PROPERTY_CHECKED = 1 /* << 0 */;

    private static final int PROPERTY_ENABLED = 1 << 1;

    private static final int PROPERTY_PASSWORD = 1 << 2;

    private static final int PROPERTY_FULL_SCREEN = 1 << 7;

    private static final int PROPERTY_SCROLLABLE = 1 << 8;

    private static final int PROPERTY_IMPORTANT_FOR_ACCESSIBILITY = 1 << 9;

    private static final int PROPERTY_ACCESSIBILITY_DATA_SENSITIVE = 1 << 10;



    private static final int GET_SOURCE_PREFETCH_FLAGS =

            AccessibilityNodeInfo.FLAG_PREFETCH_ANCESTORS