1 files changed, 4 insertions, 10 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 8f1facd9d..200fa68dd 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1002,8 +1002,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
     }
 
     // This will reset the whole input state to the starting state. It will clear
-    // the composing word, reset the last composed word, tell the inputconnection
-    // and the composingStateManager about it.
+    // the composing word, reset the last composed word, tell the inputconnection about it.
     private void resetEntireInputState() {
         resetComposingState(true /* alsoResetLastComposedWord */);
         updateSuggestions();
@@ -1894,14 +1893,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
      */
     private void commitChosenWord(final CharSequence chosenWord, final int commitType,
             final int separatorCode) {
-        if (mCurrentSettings.mEnableSuggestionSpanInsertion) {
-            final SuggestedWords suggestedWords = mSuggestionsView.getSuggestions();
-            mConnection.commitText(SuggestionSpanUtils.getTextWithSuggestionSpan(
-                    this, chosenWord, suggestedWords, mIsMainDictionaryAvailable),
-                    1);
-        } else {
-            mConnection.commitText(chosenWord, 1);
-        }
+        final SuggestedWords suggestedWords = mSuggestionsView.getSuggestions();
+        mConnection.commitText(SuggestionSpanUtils.getTextWithSuggestionSpan(
+                this, chosenWord, suggestedWords, mIsMainDictionaryAvailable), 1);
         if (ProductionFlag.IS_EXPERIMENTAL) {
             ResearchLogger.latinIME_commitText(chosenWord);
         }