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 am: c4ab817595

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17084045

Change-Id: I39f3ea0dcc65d305aa67da157bce58850ea2b76b
This commit is contained in:
Winson Chiu
2022-03-05 01:33:51 +00:00
committed by Automerger Merge Worker
parent 8fc61156b6 c4ab817595
commit ebafc9a564
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

@@ -2094,7 +2094,7 @@ package android {
field public static final int accessibilityActionScrollUp = 16908344; // 0x1020038 field public static final int accessibilityActionScrollUp = 16908344; // 0x1020038
field public static final int accessibilityActionSetProgress = 16908349; // 0x102003d field public static final int accessibilityActionSetProgress = 16908349; // 0x102003d
field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036 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 accessibilityActionShowTooltip = 16908356; // 0x1020044
field public static final int accessibilitySystemActionBack = 16908363; // 0x102004b field public static final int accessibilitySystemActionBack = 16908363; // 0x102004b
field public static final int accessibilitySystemActionHome = 16908364; // 0x102004c 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_SELECTION;
field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_TEXT; 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 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 public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_TOOLTIP;
field @NonNull public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> CREATOR;
} }

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

@@ -4487,8 +4487,8 @@ public class AccessibilityNodeInfo implements Parcelable {
case R.id.accessibilityActionDragDrop: case R.id.accessibilityActionDragDrop:
return "ACTION_DROP"; return "ACTION_DROP";
default: { default: {
if (action == R.id.accessibilityActionShowSuggestions) { if (action == R.id.accessibilityActionShowTextSuggestions) {
return "ACTION_SHOW_SUGGESTIONS"; return "ACTION_SHOW_TEXT_SUGGESTIONS";
} }
return "ACTION_UNKNOWN"; return "ACTION_UNKNOWN";
} }
@@ -5191,8 +5191,8 @@ public class AccessibilityNodeInfo implements Parcelable {
/** /**
* Action to show suggestions for editable text. * Action to show suggestions for editable text.
*/ */
@NonNull public static final AccessibilityAction ACTION_SHOW_SUGGESTIONS = @NonNull public static final AccessibilityAction ACTION_SHOW_TEXT_SUGGESTIONS =
new AccessibilityAction(R.id.accessibilityActionShowSuggestions); new AccessibilityAction(R.id.accessibilityActionShowTextSuggestions);
private final int mActionId; private final int mActionId;
private final CharSequence mLabel; 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); info.addAction(AccessibilityNodeInfo.ACTION_CUT);
} }
if (canReplace()) { if (canReplace()) {
info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SHOW_SUGGESTIONS); info.addAction(
AccessibilityNodeInfo.AccessibilityAction.ACTION_SHOW_TEXT_SUGGESTIONS);
} }
if (canShare()) { if (canShare()) {
info.addAction(new AccessibilityNodeInfo.AccessibilityAction( info.addAction(new AccessibilityNodeInfo.AccessibilityAction(
@@ -12634,7 +12635,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
default: { default: {
// New ids have static blocks to assign values, so they can't be used in a case // New ids have static blocks to assign values, so they can't be used in a case
// block. // block.
if (action == R.id.accessibilityActionShowSuggestions) { if (action == R.id.accessibilityActionShowTextSuggestions) {
return isFocused() && canReplace() && onTextContextMenuItem(ID_REPLACE); return isFocused() && canReplace() && onTextContextMenuItem(ID_REPLACE);
} }
return super.performAccessibilityActionInternal(action, arguments); return super.performAccessibilityActionInternal(action, arguments);

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

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

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

@@ -3288,7 +3288,7 @@
<public name="removed_accessibilityActionSwipeRight" /> <public name="removed_accessibilityActionSwipeRight" />
<public name="removed_accessibilityActionSwipeUp" /> <public name="removed_accessibilityActionSwipeUp" />
<public name="removed_accessibilityActionSwipeDown" /> <public name="removed_accessibilityActionSwipeDown" />
<public name="accessibilityActionShowSuggestions" /> <public name="accessibilityActionShowTextSuggestions" />
<public name="inputExtractAction" /> <public name="inputExtractAction" />
<public name="inputExtractAccessories" /> <public name="inputExtractAccessories" />
</staging-public-group> </staging-public-group>