From e8bb8351d6f09f461851af619cabe5fcd2f66c0a Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Sat, 16 Jun 2012 11:06:29 +0900
Subject: [PATCH] Cleanup, part 9 (C9)

Change-Id: Ifb15553824915d0634aea83689302c2418b093f3
---
 java/src/com/android/inputmethod/latin/LatinIME.java  | 11 +++--------
 .../com/android/inputmethod/latin/SettingsValues.java |  3 ---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 8f1facd9d..b8aab4cdf 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1894,14 +1894,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);
         }
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index 6b4b85ff6..ef423f19b 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -78,7 +78,6 @@ public class SettingsValues {
     public final boolean mUseContactsDict;
     // Use bigrams to predict the next word when there is no input for it yet
     public final boolean mBigramPredictionEnabled;
-    public final boolean mEnableSuggestionSpanInsertion;
     @SuppressWarnings("unused") // TODO: Use this
     private final int mVibrationDurationSettingsRawValue;
     @SuppressWarnings("unused") // TODO: Use this
@@ -156,8 +155,6 @@ public class SettingsValues {
         mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true);
         mAutoCorrectEnabled = isAutoCorrectEnabled(res, mAutoCorrectionThresholdRawValue);
         mBigramPredictionEnabled = isBigramPredictionEnabled(prefs, res);
-        // TODO: remove mEnableSuggestionSpanInsertion. It's always true.
-        mEnableSuggestionSpanInsertion = true;
         mVibrationDurationSettingsRawValue =
                 prefs.getInt(Settings.PREF_VIBRATION_DURATION_SETTINGS, -1);
         mKeypressSoundVolumeRawValue = prefs.getFloat(Settings.PREF_KEYPRESS_SOUND_VOLUME, -1.0f);