Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename ACTION_SHOW_SUGGESTSIONS TO ACTION_SHOW_TEXT_SUGGESTIONS

Browse Source 
Fix: 217730256
Test: Added test in EditTextTest (will merge later when reviewed).
Change-Id: I78354a0f1d955c5b7c1ead044ea49086b3479841
This commit is contained in:
yingleiw
2022-02-14 15:39:08 -08:00
parent 74286e44eb
commit e1f392d171
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -2087,7 +2087,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 accessibilityActionSwipeDown;
field public static final int accessibilityActionSwipeLeft;
@@ -51861,7 +51861,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.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_DOWN;
field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SWIPE_LEFT;

8
core/java/android/view/accessibility/AccessibilityNodeInfo.java
View File

@@ -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";
}
@@ -5215,8 +5215,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;

5
core/java/android/widget/TextView.java
View File

@@ -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);

4
core/res/res/values/ids.xml
View File

@@ -281,8 +281,8 @@
<!-- 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_SUGGESTIONS}. -->
<item type="id" name="accessibilityActionShowSuggestions" />
<!-- Accessibility action identifier for {@link android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_SHOW_TEXT_SUGGESTIONS}. -->
<item type="id" name="accessibilityActionShowTextSuggestions" />
<!-- View tag for remote views to store the index of the next child when adding nested remote views dynamically. -->
<item type="id" name="remote_views_next_child" />

2
core/res/res/values/public.xml
View File

@@ -3283,7 +3283,7 @@
<public name="accessibilityActionSwipeRight" />
<public name="accessibilityActionSwipeUp" />
<public name="accessibilityActionSwipeDown" />
<public name="accessibilityActionShowSuggestions" />
<public name="accessibilityActionShowTextSuggestions" />
<public name="inputExtractAction" />
<public name="inputExtractAccessories" />
</staging-public-group>