Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-03 15:44:37 +00:00
committed by Android (Google) Code Review
parent 52e3d9a45e d32571e9b5
commit 7b0989f35d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/Editor.java
View File

@@ -6684,13 +6684,13 @@ public class Editor {
if (TextView.DEBUG_CURSOR) { if (TextView.DEBUG_CURSOR) {
logCursor("SelectionModifierCursorController: onTouchEvent", "ACTION_UP"); logCursor("SelectionModifierCursorController: onTouchEvent", "ACTION_UP");
} }
if (mEndHandle != null) {
mEndHandle.dismissMagnifier();
}
if (!isDragAcceleratorActive()) { if (!isDragAcceleratorActive()) {
break; break;
} }
updateSelection(event); updateSelection(event);
if (mEndHandle != null) {
mEndHandle.dismissMagnifier();
}
// No longer dragging to select text, let the parent intercept events. // No longer dragging to select text, let the parent intercept events.
mTextView.getParent().requestDisallowInterceptTouchEvent(false); mTextView.getParent().requestDisallowInterceptTouchEvent(false);