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 am: 7b0989f35d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344156

Change-Id: I1755980f2ff127f8a29147d656915ddc37bfc544
This commit is contained in:
TreeHugger Robot
2021-05-03 16:02:01 +00:00
committed by Automerger Merge Worker
parent e360060089 7b0989f35d
commit 7b3a01b886
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);