am fe2d9079: Fix a bug that the typed word with the blue underline indicator will be duplicated

* commit 'fe2d90798ea409ee39d6f63942eb01bb7eed98e3':
  Fix a bug that the typed word with the blue underline indicator will be duplicated

1 files changed, 5 insertions, 38 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 517385cf3..2bd173526 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -230,7 +230,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
     private CharSequence mEnteredText;
 
     private final ComposingStateManager mComposingStateManager =
-            new ComposingStateManager();
+            ComposingStateManager.getInstance();
 
     public final UIHandler mHandler = new UIHandler(this);
 
@@ -1635,6 +1635,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
                     mComposingStateManager.isAutoCorrectionIndicatorOn();
             final boolean newAutoCorrectionIndicator = Utils.willAutoCorrect(words);
             if (oldAutoCorrectionIndicator != newAutoCorrectionIndicator) {
+                if (LatinImeLogger.sDBG) {
+                    Log.d(TAG, "Flip the indicator. " + oldAutoCorrectionIndicator
+                            + " -> " + newAutoCorrectionIndicator);
+                }
                 final CharSequence textWithUnderline = newAutoCorrectionIndicator
                         ? SuggestionSpanUtils.getTextWithAutoCorrectionIndicatorUnderline(
                                 this, mComposingStringBuilder)
@@ -2300,43 +2304,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
         showOptionDialogInternal(builder.create());
     }
 
-    private static class ComposingStateManager {
-        private boolean mAutoCorrectionIndicatorOn;
-        private boolean mIsComposing;
-        public ComposingStateManager() {
-            mAutoCorrectionIndicatorOn = false;
-            mIsComposing = false;
-        }
-
-        private void onStartComposingText() {
-            if (!mIsComposing) {
-                if (LatinImeLogger.sDBG) {
-                    Log.i(TAG, "Start composing text.");
-                }
-                mAutoCorrectionIndicatorOn = false;
-                mIsComposing = true;
-            }
-        }
-
-        private void onFinishComposingText() {
-            if (mIsComposing) {
-                if (LatinImeLogger.sDBG) {
-                    Log.i(TAG, "Finish composing text.");
-                }
-                mAutoCorrectionIndicatorOn = false;
-                mIsComposing = false;
-            }
-        }
-
-        public boolean isAutoCorrectionIndicatorOn() {
-            return mAutoCorrectionIndicatorOn;
-        }
-
-        public void setAutoCorrectionIndicatorOn(boolean on) {
-            mAutoCorrectionIndicatorOn = on;
-        }
-    }
-
     @Override
     protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) {
         super.dump(fd, fout, args);