From 5a8bea1a5de9f35c87c45883035f399873d3d615 Mon Sep 17 00:00:00 2001 From: TreeHugger Robot Date: Tue, 1 Mar 2022 19:27:22 +0000 Subject: [PATCH 1/2] Revert 'Adding definitions for AccessibilityAction directional swipes.' This reverts commit 0de71ca543259d52b417006b8d43196e0be6e21c. Reason for revert: Don't yet have a use for the definitions, and will likely reimplement them differently. This is an adjusted revert to account for a resource finalization error Test: Is a reversion. Bug: 222537368 Merged-In: I99a71551069069d117039af4708030772b741cea Change-Id: I99a71551069069d117039af4708030772b741cea (cherry picked from commit 65e5bf07c2c73a2d2852570a53a1614200a32504) --- core/api/current.txt | 8 ------- .../accessibility/AccessibilityNodeInfo.java | 24 ------------------- core/res/res/values/ids.xml | 12 ---------- core/res/res/values/public.xml | 8 +++---- 4 files changed, 4 insertions(+), 48 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index f0b86df676e15..cf0d064f1d520 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -2096,10 +2096,6 @@ package android { field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036 field public static final int accessibilityActionShowSuggestions; 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 @@ -51933,10 +51929,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_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 CREATOR; } diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index aeef76c3d048c..b927d98b7d3ba 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -5188,30 +5188,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. */ diff --git a/core/res/res/values/ids.xml b/core/res/res/values/ids.xml index 29eb0c0365b37..385c07ed732e1 100644 --- a/core/res/res/values/ids.xml +++ b/core/res/res/values/ids.xml @@ -270,18 +270,6 @@ - - - - - - - - - - - - diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 3467e1b404700..1ba2993880d17 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3284,10 +3284,10 @@ - - - - + + + + From a3a06ac2314bd23626b4172a861215702307e7fe Mon Sep 17 00:00:00 2001 From: yingleiw Date: Mon, 14 Feb 2022 15:39:08 -0800 Subject: [PATCH 2/2] Rename ACTION_SHOW_SUGGESTSIONS TO ACTION_SHOW_TEXT_SUGGESTIONS Fix: 217730256 Bug: 222537368 Test: Added test in EditTextTest (will merge later when reviewed). Merged-In: I78354a0f1d955c5b7c1ead044ea49086b3479841 Change-Id: I78354a0f1d955c5b7c1ead044ea49086b3479841 (cherry picked from commit e1f392d171acacbccb15516c73b06fa7835d2d2e) --- core/api/current.txt | 4 ++-- .../android/view/accessibility/AccessibilityNodeInfo.java | 8 ++++---- core/java/android/widget/TextView.java | 5 +++-- core/res/res/values/ids.xml | 4 ++-- core/res/res/values/public.xml | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index cf0d064f1d520..2cbc536edbbfa 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -2094,7 +2094,7 @@ package android { field public static final int accessibilityActionScrollUp = 16908344; // 0x1020038 field public static final int accessibilityActionSetProgress = 16908349; // 0x102003d field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036 - field public static final int accessibilityActionShowSuggestions; + field public static final int accessibilityActionShowTextSuggestions; field public static final int accessibilityActionShowTooltip = 16908356; // 0x1020044 field public static final int accessibilitySystemActionBack = 16908363; // 0x102004b field public static final int accessibilitySystemActionHome = 16908364; // 0x102004c @@ -51927,7 +51927,7 @@ package android.view.accessibility { field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_SELECTION; field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_TEXT; 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_SUGGESTIONS; + 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.os.Parcelable.Creator CREATOR; } diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index b927d98b7d3ba..0008aa64efa41 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -4487,8 +4487,8 @@ public class AccessibilityNodeInfo implements Parcelable { case R.id.accessibilityActionDragDrop: return "ACTION_DROP"; default: { - if (action == R.id.accessibilityActionShowSuggestions) { - return "ACTION_SHOW_SUGGESTIONS"; + if (action == R.id.accessibilityActionShowTextSuggestions) { + return "ACTION_SHOW_TEXT_SUGGESTIONS"; } return "ACTION_UNKNOWN"; } @@ -5191,8 +5191,8 @@ public class AccessibilityNodeInfo implements Parcelable { /** * Action to show suggestions for editable text. */ - @NonNull public static final AccessibilityAction ACTION_SHOW_SUGGESTIONS = - new AccessibilityAction(R.id.accessibilityActionShowSuggestions); + @NonNull public static final AccessibilityAction ACTION_SHOW_TEXT_SUGGESTIONS = + new AccessibilityAction(R.id.accessibilityActionShowTextSuggestions); private final int mActionId; private final CharSequence mLabel; diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index c207af53fab7a..b076d399d44aa 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -12313,7 +12313,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener info.addAction(AccessibilityNodeInfo.ACTION_CUT); } if (canReplace()) { - info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SHOW_SUGGESTIONS); + info.addAction( + AccessibilityNodeInfo.AccessibilityAction.ACTION_SHOW_TEXT_SUGGESTIONS); } if (canShare()) { info.addAction(new AccessibilityNodeInfo.AccessibilityAction( @@ -12634,7 +12635,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener default: { // New ids have static blocks to assign values, so they can't be used in a case // block. - if (action == R.id.accessibilityActionShowSuggestions) { + if (action == R.id.accessibilityActionShowTextSuggestions) { return isFocused() && canReplace() && onTextContextMenuItem(ID_REPLACE); } return super.performAccessibilityActionInternal(action, arguments); diff --git a/core/res/res/values/ids.xml b/core/res/res/values/ids.xml index 385c07ed732e1..082acbe3443a5 100644 --- a/core/res/res/values/ids.xml +++ b/core/res/res/values/ids.xml @@ -270,8 +270,8 @@ - - + + diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 1ba2993880d17..aed1b0d04c8bd 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3288,7 +3288,7 @@ - +