diff options
author | 2021-05-03 15:44:37 +0000 | |
---|---|---|
committer | 2021-05-03 15:44:37 +0000 | |
commit | 7b0989f35dc44b2d4bb01e7396f9547e16544152 (patch) | |
tree | 20abed230ccf418f2596a31da114dc54b669b161 | |
parent | 52e3d9a45e151cb502bd71fac7540d69739345f7 (diff) | |
parent | d32571e9b549468ff35312ee97f54198e094e3db (diff) |
Merge "Dismiss magnifier correctly in concurrent editing scenario" into sc-dev
-rw-r--r-- | core/java/android/widget/Editor.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index e06d5f00fb2c..444736160f0f 100644 --- 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); |