commit c1cd17f91843decf8e8ced6546cbbd634798c525
author Keisuke Kuroyanagi <ksk@google.com> Thu Mar 03 23:34:47 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 03 23:34:51 2016 +0000
tree d5e65f4ded5e09d997b7eff24e22f80a70907e30
parent 39428c1337e007f393780546d80e5201b68f9943
parent 4a696ac7ca0d9c6e1f837cbf83ef055e6e0c9bc2

Merge "Supress SuggestionPopup for original field." into nyc-dev

core/java/android/widget/Editor.java

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 5c06638..e949c52 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -3178,7 +3178,7 @@
                 ((Spannable) mTextView.getText()).removeSpan(mSuggestionRangeSpan);
 
                 mTextView.setCursorVisible(mCursorWasVisibleBeforeSuggestions);
-                if (hasInsertionController()) {
+                if (hasInsertionController() && !extractedTextModeWillBeStarted()) {
                     getInsertionController().show();
                 }
             }
@@ -3328,6 +3328,9 @@
         @Override
         public void show() {
             if (!(mTextView.getText() instanceof Editable)) return;
+            if (extractedTextModeWillBeStarted()) {
+                return;
+            }
 
             if (updateSuggestions()) {
                 mCursorWasVisibleBeforeSuggestions = mCursorVisible;