From 35c550c854a99ae890d7cffcee4491e68c71a09d Mon Sep 17 00:00:00 2001
From: Andrei Stingaceanu <stg@google.com>
Date: Thu, 7 May 2015 16:49:49 +0100
Subject: [PATCH] Fix: text selection bubbles move along with the text

Always hide the selection cursor when showing the
insertion cursor.

Bug: 19857679
Change-Id: I549552fa5026e60f94900364b8194217e0de4b4a
---
 core/java/android/widget/Editor.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 55f4562afa920..5e33f83dd82b8 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1806,6 +1806,7 @@ public class Editor {
                 // When the cursor moves, the word that was typed may need spell check
                 mSpellChecker.onSelectionChanged();
             }
+
             if (!extractedTextModeWillBeStarted()) {
                 if (isCursorInsideEasyCorrectionSpan()) {
                     mShowSuggestionRunnable = new Runnable() {
@@ -4113,6 +4114,10 @@ public class Editor {
 
         public void show() {
             getHandle().show();
+
+            if (mSelectionModifierCursorController != null) {
+                mSelectionModifierCursorController.hide();
+            }
         }
 
         public void hide() {