Merge "Makes the multi-touch prevention only works for editable TextView." into rvc-qpr-dev

2020-11-26 00:22:20 +00:00
parent 2b3c92cf0c 62f51e6722
commit b72c8a096b
1 changed files with 4 additions and 4 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -11009,12 +11009,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                    MotionEvent.actionToString(event.getActionMasked()),
                    event.getX(), event.getY());
        }
-        if (!isFromPrimePointer(event, false)) {
-            return true;
-        }
-
        final int action = event.getActionMasked();
        if (mEditor != null) {
+            if (!isFromPrimePointer(event, false)) {
+                return true;
+            }
+
            mEditor.onTouchEvent(event);

            if (mEditor.mInsertionPointCursorController != null