Merge "Fix: text selection bubbles move along with the text" into mnc-dev

1 files changed, 5 insertions, 0 deletions

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 55f4562afa92..5e33f83dd82b 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() {