am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev

* commit '2f11125a7186cc65713804c939a0e538538d9f35':
  Give accessibility delegate the first pass at handling ACTION_CLICK

2 files changed, 12 insertions, 4 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 2bb1ebc..75411fe 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8185,8 +8185,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
     * @see #performAccessibilityAction(int, Bundle)
     *
     * Note: Called from the default {@link AccessibilityDelegate}.
+    *
+    * @hide Until we've refactored all accessibility delegation methods.
     */
-    boolean performAccessibilityActionInternal(int action, Bundle arguments) {
+    public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
         switch (action) {
             case AccessibilityNodeInfo.ACTION_CLICK: {
                 if (isClickable()) {
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 597de1e..edba9f5 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8476,8 +8476,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         }
     }
 
+    /**
+     * Performs an accessibility action after it has been offered to the
+     * delegate.
+     *
+     * @hide
+     */
     @Override
-    public boolean performAccessibilityAction(int action, Bundle arguments) {
+    public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
         switch (action) {
             case AccessibilityNodeInfo.ACTION_CLICK: {
                 boolean handled = false;
@@ -8558,10 +8564,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY:
             case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY: {
                 ensureIterableTextForAccessibilitySelectable();
-                return super.performAccessibilityAction(action, arguments);
+                return super.performAccessibilityActionInternal(action, arguments);
             }
             default: {
-                return super.performAccessibilityAction(action, arguments);
+                return super.performAccessibilityActionInternal(action, arguments);
             }
         }
     }