Merge "Add accessibility actions for scrolling in different directions" (aba56b64) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −1

Original line number	Diff line number	Diff line
		@@ -1684,7 +1684,11 @@ package android {

		public static final class R.id {
		ctor public R.id();
		field public static final int accessibilityActionScrollDown = 16908345; // 0x1020039
		field public static final int accessibilityActionScrollLeft = 16908344; // 0x1020038
		field public static final int accessibilityActionScrollRight = 16908346; // 0x102003a
		field public static final int accessibilityActionScrollToPosition = 16908342; // 0x1020036
		field public static final int accessibilityActionScrollUp = 16908343; // 0x1020037
		field public static final int accessibilityActionShowOnScreen = 16908341; // 0x1020035
		field public static final int addToDictionary = 16908330; // 0x102002a
		field public static final int background = 16908288; // 0x1020000
		@@ -1725,7 +1729,7 @@ package android {
		field public static final int selectAll = 16908319; // 0x102001f
		field public static final int selectTextMode = 16908333; // 0x102002d
		field public static final int selectedIcon = 16908302; // 0x102000e
		field public static final int shareText = 16908343; // 0x1020037
		field public static final int shareText = 16908347; // 0x102003b
		field public static final int startSelectingText = 16908328; // 0x1020028
		field public static final int statusBarBackground = 16908335; // 0x102002f
		field public static final int stopSelectingText = 16908329; // 0x1020029
		@@ -37791,8 +37795,12 @@ package android.view.accessibility {
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY;
		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_DOWN;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_FORWARD;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_LEFT;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_RIGHT;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_TO_POSITION;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_UP;
		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

+9 −1

Original line number	Diff line number	Diff line
		@@ -1759,7 +1759,11 @@ package android {

		public static final class R.id {
		ctor public R.id();
		field public static final int accessibilityActionScrollDown = 16908345; // 0x1020039
		field public static final int accessibilityActionScrollLeft = 16908344; // 0x1020038
		field public static final int accessibilityActionScrollRight = 16908346; // 0x102003a
		field public static final int accessibilityActionScrollToPosition = 16908342; // 0x1020036
		field public static final int accessibilityActionScrollUp = 16908343; // 0x1020037
		field public static final int accessibilityActionShowOnScreen = 16908341; // 0x1020035
		field public static final int addToDictionary = 16908330; // 0x102002a
		field public static final int background = 16908288; // 0x1020000
		@@ -1800,7 +1804,7 @@ package android {
		field public static final int selectAll = 16908319; // 0x102001f
		field public static final int selectTextMode = 16908333; // 0x102002d
		field public static final int selectedIcon = 16908302; // 0x102000e
		field public static final int shareText = 16908343; // 0x1020037
		field public static final int shareText = 16908347; // 0x102003b
		field public static final int startSelectingText = 16908328; // 0x1020028
		field public static final int statusBarBackground = 16908335; // 0x102002f
		field public static final int stopSelectingText = 16908329; // 0x1020029
		@@ -40004,8 +40008,12 @@ package android.view.accessibility {
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY;
		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_DOWN;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_FORWARD;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_LEFT;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_RIGHT;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_TO_POSITION;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SCROLL_UP;
		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

+5 −1

Original line number	Diff line number	Diff line
		@@ -8473,7 +8473,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
		if (isNestedScrollingEnabled()
		&& (action == AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD
		\|\| action == AccessibilityNodeInfo.ACTION_SCROLL_FORWARD)) {
		\|\| action == AccessibilityNodeInfo.ACTION_SCROLL_FORWARD
		\|\| action == R.id.accessibilityActionScrollUp
		\|\| action == R.id.accessibilityActionScrollLeft
		\|\| action == R.id.accessibilityActionScrollDown
		\|\| action == R.id.accessibilityActionScrollRight)) {
		if (dispatchNestedPrePerformAccessibilityAction(action, arguments)) {
		return true;
		}

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

+29 −0

Original line number	Diff line number	Diff line
		@@ -3472,6 +3472,31 @@ public class AccessibilityNodeInfo implements Parcelable {
		public static final AccessibilityAction ACTION_SCROLL_TO_POSITION =
		new AccessibilityAction(R.id.accessibilityActionScrollToPosition, null);

		/**
		* Action to scroll the node content up.
		*/
		public static final AccessibilityAction ACTION_SCROLL_UP =
		new AccessibilityAction(R.id.accessibilityActionScrollUp, null);

		/**
		* Action to scroll the node content left.
		*/
		public static final AccessibilityAction ACTION_SCROLL_LEFT =
		new AccessibilityAction(R.id.accessibilityActionScrollLeft, null);

		/**
		* Action to scroll the node content down.
		*/
		public static final AccessibilityAction ACTION_SCROLL_DOWN =
		new AccessibilityAction(R.id.accessibilityActionScrollDown, null);

		/**
		* Action to scroll the node content right.
		*/
		public static final AccessibilityAction ACTION_SCROLL_RIGHT =
		new AccessibilityAction(R.id.accessibilityActionScrollRight, null);


		private static final ArraySet<AccessibilityAction> sStandardActions = new ArraySet<>();
		static {
		sStandardActions.add(ACTION_FOCUS);
		@@ -3498,6 +3523,10 @@ public class AccessibilityNodeInfo implements Parcelable {
		sStandardActions.add(ACTION_SET_TEXT);
		sStandardActions.add(ACTION_SHOW_ON_SCREEN);
		sStandardActions.add(ACTION_SCROLL_TO_POSITION);
		sStandardActions.add(ACTION_SCROLL_UP);
		sStandardActions.add(ACTION_SCROLL_LEFT);
		sStandardActions.add(ACTION_SCROLL_DOWN);
		sStandardActions.add(ACTION_SCROLL_RIGHT);
		}

		private final int mActionId;

core/java/android/widget/AbsListView.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -1506,10 +1506,12 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		if (isEnabled()) {
		if (canScrollUp()) {
		info.addAction(AccessibilityAction.ACTION_SCROLL_BACKWARD);
		info.addAction(AccessibilityAction.ACTION_SCROLL_UP);
		info.setScrollable(true);
		}
		if (canScrollDown()) {
		info.addAction(AccessibilityAction.ACTION_SCROLL_FORWARD);
		info.addAction(AccessibilityAction.ACTION_SCROLL_DOWN);
		info.setScrollable(true);
		}
		}
		@@ -1537,14 +1539,16 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		return true;
		}
		switch (action) {
		case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD: {
		case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD:
		case R.id.accessibilityActionScrollDown: {
		if (isEnabled() && getLastVisiblePosition() < getCount() - 1) {
		final int viewportHeight = getHeight() - mListPadding.top - mListPadding.bottom;
		smoothScrollBy(viewportHeight, PositionScroller.SCROLL_DURATION);
		return true;
		}
		} return false;
		case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD: {
		case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD:
		case R.id.accessibilityActionScrollUp: {
		if (isEnabled() && mFirstPosition > 0) {
		final int viewportHeight = getHeight() - mListPadding.top - mListPadding.bottom;
		smoothScrollBy(-viewportHeight, PositionScroller.SCROLL_DURATION);