Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a880fd5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Dismiss magnifier correctly in concurrent editing scenario" into sc-dev am: 7b0989f3 

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

Change-Id: I049046dc9586c6e6987ed284a59e73575536772c
parents f14bb8ab 7b0989f3

core/java/android/widget/Editor.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -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);