Merge "Revert 'Adding definitions for AccessibilityAction directional swipes.'" (d903b035) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −8

Original line number	Diff line number	Diff line
		@@ -2096,10 +2096,6 @@ package android {
		field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036
		field public static final int accessibilityActionShowTextSuggestions;
		field public static final int accessibilityActionShowTooltip = 16908356; // 0x1020044
		field public static final int accessibilityActionSwipeDown;
		field public static final int accessibilityActionSwipeLeft;
		field public static final int accessibilityActionSwipeRight;
		field public static final int accessibilityActionSwipeUp;
		field public static final int accessibilitySystemActionBack = 16908363; // 0x102004b
		field public static final int accessibilitySystemActionHome = 16908364; // 0x102004c
		field public static final int accessibilitySystemActionLockScreen = 16908370; // 0x1020052
		@@ -51944,10 +51940,6 @@ package android.view.accessibility {
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_ON_SCREEN;
		field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_TEXT_SUGGESTIONS;
		field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_TOOLTIP;
		field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_DOWN;
		field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_LEFT;
		field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_RIGHT;
		field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_UP;
		field @NonNull public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> CREATOR;
		}

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

+0 −24

Original line number	Diff line number	Diff line
		@@ -5194,30 +5194,6 @@ public class AccessibilityNodeInfo implements Parcelable {
		@NonNull public static final AccessibilityAction ACTION_DRAG_CANCEL =
		new AccessibilityAction(R.id.accessibilityActionDragCancel);

		/**
		* Action to perform a left swipe.
		*/
		@NonNull public static final AccessibilityAction ACTION_SWIPE_LEFT =
		new AccessibilityAction(R.id.accessibilityActionSwipeLeft);

		/**
		* Action to perform a right swipe.
		*/
		@NonNull public static final AccessibilityAction ACTION_SWIPE_RIGHT =
		new AccessibilityAction(R.id.accessibilityActionSwipeRight);

		/**
		* Action to perform an up swipe.
		*/
		@NonNull public static final AccessibilityAction ACTION_SWIPE_UP =
		new AccessibilityAction(R.id.accessibilityActionSwipeUp);

		/**
		* Action to perform a down swipe.
		*/
		@NonNull public static final AccessibilityAction ACTION_SWIPE_DOWN =
		new AccessibilityAction(R.id.accessibilityActionSwipeDown);

		/**
		* Action to show suggestions for editable text.
		*/

core/res/res/values/ids.xml

+0 −12

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

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

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

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

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

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

core/res/res/values/public.xml

+0 −4

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

		<staging-public-group type="id" first-id="0x01de0000">
		<public name="accessibilityActionSwipeLeft" />
		<public name="accessibilityActionSwipeRight" />
		<public name="accessibilityActionSwipeUp" />
		<public name="accessibilityActionSwipeDown" />
		<public name="accessibilityActionShowTextSuggestions" />
		<public name="inputExtractAction" />
		<public name="inputExtractAccessories" />