Merge "Dismiss magnifier correctly in concurrent editing scenario" into sc-dev

2021-05-03 15:44:37 +00:00
parent 52e3d9a45e d32571e9b5
commit 7b0989f35d
1 changed files with 3 additions and 3 deletions
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -6684,13 +6684,13 @@ public class Editor {
                    if (TextView.DEBUG_CURSOR) {
                        logCursor("SelectionModifierCursorController: onTouchEvent", "ACTION_UP");
                    }
+                    if (mEndHandle != null) {
+                        mEndHandle.dismissMagnifier();
+                    }
                    if (!isDragAcceleratorActive()) {
                        break;
                    }
                    updateSelection(event);
-                    if (mEndHandle != null) {
-                        mEndHandle.dismissMagnifier();
-                    }

                    // No longer dragging to select text, let the parent intercept events.
                    mTextView.getParent().requestDisallowInterceptTouchEvent(false);