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

Merge changes from topics "presubmit-am-a8421206bd26452e95f6cad042b4b6bc", "presubmit-am-db10d76a65b5494fb2108722543f3813" into tm-dev

Browse Source 
* changes:
  Rename ACTION_SHOW_SUGGESTSIONS TO ACTION_SHOW_TEXT_SUGGESTIONS
  Revert 'Adding definitions for AccessibilityAction directional swipes.'
This commit is contained in:
Winson Chiu
2022-03-05 01:03:35 +00:00
committed by Android (Google) Code Review
parent d00d9c2bde a3a06ac231
commit c4ab817595
5 changed files with 16 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/api/current.txt
View File

@@ -2094,12 +2094,8 @@ 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;
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
@@ -51931,12 +51927,8 @@ 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;
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;
}

32
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";
}
@@ -5188,35 +5188,11 @@ 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.
*/
@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);

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

@@ -270,20 +270,8 @@
<!-- 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_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" />

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

@@ -3284,11 +3284,11 @@
</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="accessibilityActionShowSuggestions" />
<public name="removed_accessibilityActionSwipeLeft" />
<public name="removed_accessibilityActionSwipeRight" />
<public name="removed_accessibilityActionSwipeUp" />
<public name="removed_accessibilityActionSwipeDown" />
<public name="accessibilityActionShowTextSuggestions" />
<public name="inputExtractAction" />
<public name="inputExtractAccessories" />
</staging-public-group>