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

Commit 23f44324 authored by Alan Viverette's avatar Alan Viverette
Browse files

Add accessibility action for scrolling to a collection position 

Cleans up verbose R package in GridView, accessibility action docs,
and some lint warnings in AccessibilityNodeInfo. Makes the action IDs
for SHOW_ON_SCREEN and SCROLL_TO_POSITION public so that we can
guarantee they won't change (and thus reference them in support lib).

Change-Id: Ica53b7be7a68b84054b9bac1fc7958a21a42e089
parent 1ffaca44

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -1696,6 +1696,8 @@ package android { 














  public static final class R.id {















    ctor public R.id();













    field public static final int accessibilityActionScrollToPosition = 16908342; // 0x1020036













    field public static final int accessibilityActionShowOnScreen = 16908341; // 0x1020035















    field public static final int addToDictionary = 16908330; // 0x102002a















    field public static final int background = 16908288; // 0x1020000















    field public static final int button1 = 16908313; // 0x1020019










@@ -36383,9 +36385,11 @@ package android.view.accessibility {













    method public void setVisibleToUser(boolean);















    method public void writeToParcel(android.os.Parcel, int);















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













    field public static final java.lang.String ACTION_ARGUMENT_COLUMN_INT = "android.view.accessibility.action.ARGUMENT_COLUMN_INT";















    field public static final java.lang.String ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN = "ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN";















    field public static final java.lang.String ACTION_ARGUMENT_HTML_ELEMENT_STRING = "ACTION_ARGUMENT_HTML_ELEMENT_STRING";















    field public static final java.lang.String ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT = "ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT";













    field public static final java.lang.String ACTION_ARGUMENT_ROW_INT = "android.view.accessibility.action.ARGUMENT_ROW_INT";















    field public static final java.lang.String ACTION_ARGUMENT_SELECTION_END_INT = "ACTION_ARGUMENT_SELECTION_END_INT";















    field public static final java.lang.String ACTION_ARGUMENT_SELECTION_START_INT = "ACTION_ARGUMENT_SELECTION_START_INT";















    field public static final java.lang.String ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE = "ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE";










@@ -36443,6 +36447,7 @@ package android.view.accessibility {













    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PREVIOUS_HTML_ELEMENT;















    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_BACKWARD;















    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_FORWARD;













    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_TO_POSITION;















    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SELECT;















    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_SELECTION;















    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_TEXT;

























api/system-current.txt



+5
−0




























Original line number
Diff line number
Diff line








@@ -1773,6 +1773,8 @@ package android {



























  public static final class R.id {















    ctor public R.id();













    field public static final int accessibilityActionScrollToPosition = 16908342; // 0x1020036













    field public static final int accessibilityActionShowOnScreen = 16908341; // 0x1020035















    field public static final int addToDictionary = 16908330; // 0x102002a















    field public static final int background = 16908288; // 0x1020000















    field public static final int button1 = 16908313; // 0x1020019










@@ -38935,9 +38937,11 @@ package android.view.accessibility {













    method public void setVisibleToUser(boolean);















    method public void writeToParcel(android.os.Parcel, int);















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













    field public static final java.lang.String ACTION_ARGUMENT_COLUMN_INT = "android.view.accessibility.action.ARGUMENT_COLUMN_INT";















    field public static final java.lang.String ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN = "ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN";















    field public static final java.lang.String ACTION_ARGUMENT_HTML_ELEMENT_STRING = "ACTION_ARGUMENT_HTML_ELEMENT_STRING";















    field public static final java.lang.String ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT = "ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT";













    field public static final java.lang.String ACTION_ARGUMENT_ROW_INT = "android.view.accessibility.action.ARGUMENT_ROW_INT";















    field public static final java.lang.String ACTION_ARGUMENT_SELECTION_END_INT = "ACTION_ARGUMENT_SELECTION_END_INT";















    field public static final java.lang.String ACTION_ARGUMENT_SELECTION_START_INT = "ACTION_ARGUMENT_SELECTION_START_INT";















    field public static final java.lang.String ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE = "ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE";










@@ -38995,6 +38999,7 @@ package android.view.accessibility {













    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PREVIOUS_HTML_ELEMENT;















    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_BACKWARD;















    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_FORWARD;













    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_TO_POSITION;















    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SELECT;















    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_SELECTION;















    field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_TEXT;

























core/java/android/view/View.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -8400,7 +8400,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













                    return true;















                }















            } break;













            case R.id.accessibility_action_show_on_screen: {













            case R.id.accessibilityActionShowOnScreen: {















                if (mAttachInfo != null) {















                    final Rect r = mAttachInfo.mTmpInvalRect;















                    getDrawingRect(r);

































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



+91
−31




























Original line number
Diff line number
Diff line








@@ -266,7 +266,8 @@ public class AccessibilityNodeInfo implements Parcelable {













     * Action to set the selection. Performing this action with no arguments















     * clears the selection.















     * <p>













     * <strong>Arguments:</strong> {@link #ACTION_ARGUMENT_SELECTION_START_INT},













     * <strong>Arguments:</strong>













     * {@link #ACTION_ARGUMENT_SELECTION_START_INT},















     * {@link #ACTION_ARGUMENT_SELECTION_END_INT}<br>















     * <strong>Example:</strong>















     * <code><pre><p>










@@ -302,7 +303,8 @@ public class AccessibilityNodeInfo implements Parcelable {













     * null</code> or empty {@link CharSequence} will clear the text. This action will also put the















     * cursor at the end of text.















     * <p>













     * <strong>Arguments:</strong> {@link #ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE}<br>













     * <strong>Arguments:</strong>













     * {@link #ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE}<br>















     * <strong>Example:</strong>















     * <code><pre><p>















     *   Bundle arguments = new Bundle();









@@ -326,12 +328,15 @@ public class AccessibilityNodeInfo implements Parcelable {













     * Argument for which movement granularity to be used when traversing the node text.















     * <p>















     * <strong>Type:</strong> int<br>













     * <strong>Actions:</strong> {@link #ACTION_NEXT_AT_MOVEMENT_GRANULARITY},













     * {@link #ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY}













     * <strong>Actions:</strong>













     * <ul>













     *     <li>{@link AccessibilityAction#ACTION_NEXT_AT_MOVEMENT_GRANULARITY}</li>













     *     <li>{@link AccessibilityAction#ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY}</li>













     * </ul>















     * </p>















     *













     * @see #ACTION_NEXT_AT_MOVEMENT_GRANULARITY













     * @see #ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY













     * @see AccessibilityAction#ACTION_NEXT_AT_MOVEMENT_GRANULARITY













     * @see AccessibilityAction#ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY















     */















    public static final String ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT =















            "ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT";









@@ -340,12 +345,15 @@ public class AccessibilityNodeInfo implements Parcelable {













     * Argument for which HTML element to get moving to the next/previous HTML element.















     * <p>















     * <strong>Type:</strong> String<br>













     * <strong>Actions:</strong> {@link #ACTION_NEXT_HTML_ELEMENT},













     *         {@link #ACTION_PREVIOUS_HTML_ELEMENT}













     * <strong>Actions:</strong>













     * <ul>













     *     <li>{@link AccessibilityAction#ACTION_NEXT_HTML_ELEMENT}</li>













     *     <li>{@link AccessibilityAction#ACTION_PREVIOUS_HTML_ELEMENT}</li>













     * </ul>















     * </p>















     *













     * @see #ACTION_NEXT_HTML_ELEMENT













     * @see #ACTION_PREVIOUS_HTML_ELEMENT













     * @see AccessibilityAction#ACTION_NEXT_HTML_ELEMENT













     * @see AccessibilityAction#ACTION_PREVIOUS_HTML_ELEMENT















     */















    public static final String ACTION_ARGUMENT_HTML_ELEMENT_STRING =















            "ACTION_ARGUMENT_HTML_ELEMENT_STRING";









@@ -355,12 +363,14 @@ public class AccessibilityNodeInfo implements Parcelable {













     * or to move it otherwise.















     * <p>















     * <strong>Type:</strong> boolean<br>













     * <strong>Actions:</strong> {@link #ACTION_NEXT_AT_MOVEMENT_GRANULARITY},













     * {@link #ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY}













     * </p>













     * <strong>Actions:</strong>













     * <ul>













     *     <li>{@link AccessibilityAction#ACTION_NEXT_AT_MOVEMENT_GRANULARITY}</li>













     *     <li>{@link AccessibilityAction#ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY}</li>













     * </ul>















     *













     * @see #ACTION_NEXT_AT_MOVEMENT_GRANULARITY













     * @see #ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY













     * @see AccessibilityAction#ACTION_NEXT_AT_MOVEMENT_GRANULARITY













     * @see AccessibilityAction#ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY















     */















    public static final String ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN =















            "ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN";









@@ -369,10 +379,12 @@ public class AccessibilityNodeInfo implements Parcelable {













     * Argument for specifying the selection start.















     * <p>















     * <strong>Type:</strong> int<br>













     * <strong>Actions:</strong> {@link #ACTION_SET_SELECTION}













     * </p>













     * <strong>Actions:</strong>













     * <ul>













     *     <li>{@link AccessibilityAction#ACTION_SET_SELECTION}</li>













     * </ul>















     *













     * @see #ACTION_SET_SELECTION













     * @see AccessibilityAction#ACTION_SET_SELECTION















     */















    public static final String ACTION_ARGUMENT_SELECTION_START_INT =















            "ACTION_ARGUMENT_SELECTION_START_INT";









@@ -381,26 +393,58 @@ public class AccessibilityNodeInfo implements Parcelable {













     * Argument for specifying the selection end.















     * <p>















     * <strong>Type:</strong> int<br>













     * <strong>Actions:</strong> {@link #ACTION_SET_SELECTION}













     * </p>













     * <strong>Actions:</strong>













     * <ul>













     *     <li>{@link AccessibilityAction#ACTION_SET_SELECTION}</li>













     * </ul>















     *













     * @see #ACTION_SET_SELECTION













     * @see AccessibilityAction#ACTION_SET_SELECTION















     */















    public static final String ACTION_ARGUMENT_SELECTION_END_INT =















            "ACTION_ARGUMENT_SELECTION_END_INT";































    /**













     * Argument for specifying the text content to set













     * Argument for specifying the text content to set.















     * <p>















     * <strong>Type:</strong> CharSequence<br>













     * <strong>Actions:</strong> {@link #ACTION_SET_TEXT}













     * </p>













     * <strong>Actions:</strong>













     * <ul>













     *     <li>{@link AccessibilityAction#ACTION_SET_TEXT}</li>













     * </ul>















     *













     * @see #ACTION_SET_TEXT













     * @see AccessibilityAction#ACTION_SET_TEXT















     */















    public static final String ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE =















            "ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE";





























    /**













     * Argument for specifying the collection row to make visible on screen.













     * <p>













     * <strong>Type:</strong> int<br>













     * <strong>Actions:</strong>













     * <ul>













     *     <li>{@link AccessibilityAction#ACTION_SCROLL_TO_POSITION}</li>













     * </ul>













     *













     * @see AccessibilityAction#ACTION_SCROLL_TO_POSITION













     */













    public static final String ACTION_ARGUMENT_ROW_INT =













            "android.view.accessibility.action.ARGUMENT_ROW_INT";



























    /**













     * Argument for specifying the collection column to make visible on screen.













     * <p>













     * <strong>Type:</strong> int<br>













     * <strong>Actions:</strong>













     * <ul>













     *     <li>{@link AccessibilityAction#ACTION_SCROLL_TO_POSITION}</li>













     * </ul>













     *













     * @see AccessibilityAction#ACTION_SCROLL_TO_POSITION













     */













    public static final String ACTION_ARGUMENT_COLUMN_INT =













            "android.view.accessibility.action.ARGUMENT_COLUMN_INT";





























    // Focus types































    /**










@@ -539,7 +583,7 @@ public class AccessibilityNodeInfo implements Parcelable {













    // Housekeeping.















    private static final int MAX_POOL_SIZE = 50;















    private static final SynchronizedPool<AccessibilityNodeInfo> sPool =













            new SynchronizedPool<AccessibilityNodeInfo>(MAX_POOL_SIZE);













            new SynchronizedPool<>(MAX_POOL_SIZE);































    private boolean mSealed;


























@@ -970,7 +1014,7 @@ public class AccessibilityNodeInfo implements Parcelable {













        }































        if (mActions == null) {













            mActions = new ArrayList<AccessibilityAction>();













            mActions = new ArrayList<>();















        }































        mActions.remove(action);










@@ -3411,9 +3455,24 @@ public class AccessibilityNodeInfo implements Parcelable {













         * @see View#requestRectangleOnScreen(Rect)















         */















        public static final AccessibilityAction ACTION_SHOW_ON_SCREEN =













                new AccessibilityAction(R.id.accessibility_action_show_on_screen, null);













                new AccessibilityAction(R.id.accessibilityActionShowOnScreen, null);



























        /**













         * Action that scrolls the node to make the specified collection













         * position visible on screen.













         * <p>













         * <strong>Arguments:</strong>













         * <ul>













         *     <li>{@link AccessibilityNodeInfo#ACTION_ARGUMENT_ROW_INT}</li>













         *     <li>{@link AccessibilityNodeInfo#ACTION_ARGUMENT_COLUMN_INT}</li>













         * <ul>













         *













         * @see AccessibilityNodeInfo#getCollectionInfo()













         */













        public static final AccessibilityAction ACTION_SCROLL_TO_POSITION =













                new AccessibilityAction(R.id.accessibilityActionScrollToPosition, null);





























        private static final ArraySet<AccessibilityAction> sStandardActions = new ArraySet<AccessibilityAction>();













        private static final ArraySet<AccessibilityAction> sStandardActions = new ArraySet<>();















        static {















            sStandardActions.add(ACTION_FOCUS);















            sStandardActions.add(ACTION_CLEAR_FOCUS);









@@ -3438,6 +3497,7 @@ public class AccessibilityNodeInfo implements Parcelable {













            sStandardActions.add(ACTION_DISMISS);















            sStandardActions.add(ACTION_SET_TEXT);















            sStandardActions.add(ACTION_SHOW_ON_SCREEN);













            sStandardActions.add(ACTION_SCROLL_TO_POSITION);















        }































        private final int mActionId;










@@ -3658,7 +3718,7 @@ public class AccessibilityNodeInfo implements Parcelable {













        private static final int MAX_POOL_SIZE = 20;































        private static final SynchronizedPool<CollectionInfo> sPool =













                new SynchronizedPool<CollectionInfo>(MAX_POOL_SIZE);













                new SynchronizedPool<>(MAX_POOL_SIZE);































        private int mRowCount;















        private int mColumnCount;










@@ -3804,7 +3864,7 @@ public class AccessibilityNodeInfo implements Parcelable {













        private static final int MAX_POOL_SIZE = 20;































        private static final SynchronizedPool<CollectionItemInfo> sPool =













                new SynchronizedPool<CollectionItemInfo>(MAX_POOL_SIZE);













                new SynchronizedPool<>(MAX_POOL_SIZE);































        /**















         * Obtains a pooled instance that is a clone of another one.

































core/java/android/widget/AbsListView.java



+7
−6




























Original line number
Diff line number
Diff line








@@ -61,6 +61,7 @@ import android.view.ViewTreeObserver;













import android.view.accessibility.AccessibilityEvent;















import android.view.accessibility.AccessibilityManager;















import android.view.accessibility.AccessibilityNodeInfo;













import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;















import android.view.accessibility.AccessibilityNodeInfo.CollectionInfo;















import android.view.animation.Interpolator;















import android.view.animation.LinearInterpolator;










@@ -1504,11 +1505,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te













        super.onInitializeAccessibilityNodeInfoInternal(info);















        if (isEnabled()) {















            if (canScrollUp()) {













                info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);













                info.addAction(AccessibilityAction.ACTION_SCROLL_BACKWARD);















                info.setScrollable(true);















            }















            if (canScrollDown()) {













                info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);













                info.addAction(AccessibilityAction.ACTION_SCROLL_FORWARD);















                info.setScrollable(true);















            }















        }










@@ -2502,18 +2503,18 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te





























        if (position == getSelectedItemPosition()) {















            info.setSelected(true);













            info.addAction(AccessibilityNodeInfo.ACTION_CLEAR_SELECTION);













            info.addAction(AccessibilityAction.ACTION_CLEAR_SELECTION);















        } else {













            info.addAction(AccessibilityNodeInfo.ACTION_SELECT);













            info.addAction(AccessibilityAction.ACTION_SELECT);















        }































        if (isClickable()) {













            info.addAction(AccessibilityNodeInfo.ACTION_CLICK);













            info.addAction(AccessibilityAction.ACTION_CLICK);















            info.setClickable(true);















        }































        if (isLongClickable()) {













            info.addAction(AccessibilityNodeInfo.ACTION_LONG_CLICK);













            info.addAction(AccessibilityAction.ACTION_LONG_CLICK);















            info.setLongClickable(true);















        }















    }