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

Commit c406acdd 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: I2391b5f3cec2b19ecfe5745107732a57133f3979
parents 4a8442b7 7b0989f3

core/java/android/widget/Editor.java

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