Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebafc9a5 authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge changes from topics "presubmit-am-a8421206bd26452e95f6cad042b4b6bc",... 

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

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

Change-Id: I39f3ea0dcc65d305aa67da157bce58850ea2b76b
parents 8fc61156 c4ab8175

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> CREATOR;

  }

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

+4 −4
Original line number Diff line number Diff line
@@ -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;

core/java/android/widget/TextView.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

core/res/res/values/ids.xml

+2 −2
Original line number Diff line number Diff line
@@ -270,8 +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_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" />

core/res/res/values/public.xml

+1 −1
Original line number Diff line number Diff line
@@ -3288,7 +3288,7 @@ 
    <public name="removed_accessibilityActionSwipeRight" />

    <public name="removed_accessibilityActionSwipeUp" />

    <public name="removed_accessibilityActionSwipeDown" />

    <public name="accessibilityActionShowSuggestions" />

    <public name="accessibilityActionShowTextSuggestions" />

    <public name="inputExtractAction" />

    <public name="inputExtractAccessories" />

  </staging-public-group>