Merge "Add ACTION_PAGE_UP/DOWN/NEXT/PREVIOUS" (a79fac05) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -1845,6 +1845,10 @@ package android {
		field public static final int accessibilityActionContextClick = 16908348; // 0x102003c
		field public static final int accessibilityActionHideTooltip = 16908357; // 0x1020045
		field public static final int accessibilityActionMoveWindow = 16908354; // 0x1020042
		field public static final int accessibilityActionPageDown = 16908359; // 0x1020047
		field public static final int accessibilityActionPageLeft = 16908360; // 0x1020048
		field public static final int accessibilityActionPageRight = 16908361; // 0x1020049
		field public static final int accessibilityActionPageUp = 16908358; // 0x1020046
		field public static final int accessibilityActionScrollDown = 16908346; // 0x102003a
		field public static final int accessibilityActionScrollLeft = 16908345; // 0x1020039
		field public static final int accessibilityActionScrollRight = 16908347; // 0x102003b
		@@ -50768,6 +50772,10 @@ package android.view.accessibility {
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_MOVE_WINDOW;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_NEXT_AT_MOVEMENT_GRANULARITY;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_NEXT_HTML_ELEMENT;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PAGE_DOWN;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PAGE_LEFT;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PAGE_RIGHT;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PAGE_UP;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_PASTE;
		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;

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

+32 −0

Original line number	Diff line number	Diff line
		@@ -3838,6 +3838,14 @@ public class AccessibilityNodeInfo implements Parcelable {
		return "ACTION_SCROLL_DOWN";
		case R.id.accessibilityActionScrollRight:
		return "ACTION_SCROLL_RIGHT";
		case R.id.accessibilityActionPageDown:
		return "ACTION_PAGE_DOWN";
		case R.id.accessibilityActionPageUp:
		return "ACTION_PAGE_UP";
		case R.id.accessibilityActionPageLeft:
		return "ACTION_PAGE_LEFT";
		case R.id.accessibilityActionPageRight:
		return "ACTION_PAGE_RIGHT";
		case R.id.accessibilityActionSetProgress:
		return "ACTION_SET_PROGRESS";
		case R.id.accessibilityActionContextClick:
		@@ -4367,6 +4375,30 @@ public class AccessibilityNodeInfo implements Parcelable {
		public static final AccessibilityAction ACTION_SCROLL_RIGHT =
		new AccessibilityAction(R.id.accessibilityActionScrollRight);

		/**
		* Action to move to the page above.
		*/
		public static final AccessibilityAction ACTION_PAGE_UP =
		new AccessibilityAction(R.id.accessibilityActionPageUp);

		/**
		* Action to move to the page below.
		*/
		public static final AccessibilityAction ACTION_PAGE_DOWN =
		new AccessibilityAction(R.id.accessibilityActionPageDown);

		/**
		* Action to move to the page left.
		*/
		public static final AccessibilityAction ACTION_PAGE_LEFT =
		new AccessibilityAction(R.id.accessibilityActionPageLeft);

		/**
		* Action to move to the page right.
		*/
		public static final AccessibilityAction ACTION_PAGE_RIGHT =
		new AccessibilityAction(R.id.accessibilityActionPageRight);

		/**
		* Action that context clicks the node.
		*/

core/res/res/values/ids.xml

+12 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,18 @@
		<!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SCROLL_RIGHT}. -->
		<item type="id" name="accessibilityActionScrollRight" />

		<!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_UP}. -->
		<item type="id" name="accessibilityActionPageUp" />

		<!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_DOWN}. -->
		<item type="id" name="accessibilityActionPageDown" />

		<!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_LEFT}. -->
		<item type="id" name="accessibilityActionPageLeft" />

		<!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_RIGHT}. -->
		<item type="id" name="accessibilityActionPageRight" />

		<!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SET_PROGRESS}. -->
		<item type="id" name="accessibilityActionSetProgress" />

core/res/res/values/public.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -2930,6 +2930,10 @@
		</public-group>

		<public-group type="id" first-id="0x01020046">
		<public name="accessibilityActionPageUp" />
		<public name="accessibilityActionPageDown" />
		<public name="accessibilityActionPageLeft" />
		<public name="accessibilityActionPageRight" />
		</public-group>

		<public-group type="string" first-id="0x0104001b">