Merge "Cherry-pick "[Android] Don't hide text handles if they are being dragged"" into klp-dev

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

@@ -2214,10 +2214,10 @@ import java.util.Map;
     // Makes the insertion/selection handles invisible. They will fade back in shortly after the
     // last call to scheduleTextHandleFadeIn (or temporarilyHideTextHandles).
     private void temporarilyHideTextHandles() {
-        if (isSelectionHandleShowing()) {
+        if (isSelectionHandleShowing() && !mSelectionHandleController.isDragging()) {
             mSelectionHandleController.setHandleVisibility(HandleView.INVISIBLE);
         }
-        if (isInsertionHandleShowing()) {
+        if (isInsertionHandleShowing() && !mInsertionHandleController.isDragging()) {
             mInsertionHandleController.setHandleVisibility(HandleView.INVISIBLE);
         }
         scheduleTextHandleFadeIn();

content/public/android/java/src/org/chromium/content/browser/input/InsertionHandleController.java

@@ -72,6 +72,13 @@ public abstract class InsertionHandleController implements CursorController {
         showPastePopup();
     }
 
+    /**
+     * @return whether the handle is being dragged.
+     */
+    public boolean isDragging() {
+        return mHandle != null && mHandle.isDragging();
+    }
+
     /** Shows the handle at the given coordinates, as long as automatic showing is allowed */
     public void onCursorPositionChanged() {
         if (mAllowAutomaticShowing) {