diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2013-12-25 01:57:18 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-12-25 01:57:18 -0800 |
| commit | 52b417dca0dccc1b838b916e31519a7380fcd4e5 (patch) | |
| tree | a505c3448d04ab62e6b5b53230ebf7b76a899e46 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | caea4be68c16c109278f4f1bd712ff18550003ef (diff) | |
| parent | bb39518bd7bb58d76f11d0deb16978a5c5fca7d9 (diff) | |
| download | latinime-52b417dca0dccc1b838b916e31519a7380fcd4e5.tar.gz latinime-52b417dca0dccc1b838b916e31519a7380fcd4e5.tar.xz latinime-52b417dca0dccc1b838b916e31519a7380fcd4e5.zip | |
am bb39518b: Use SettingsValues instead of Settings in Suggest.
* commit 'bb39518bd7bb58d76f11d0deb16978a5c5fca7d9':
Use SettingsValues instead of Settings in Suggest.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 0494dc149..68ed23897 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -79,7 +79,6 @@ import com.android.inputmethod.latin.settings.SettingsActivity; import com.android.inputmethod.latin.settings.SettingsValues; import com.android.inputmethod.latin.suggestions.SuggestionStripView; import com.android.inputmethod.latin.utils.ApplicationUtils; -import com.android.inputmethod.latin.utils.AutoCorrectionUtils; import com.android.inputmethod.latin.utils.CapsModeUtils; import com.android.inputmethod.latin.utils.CompletionInfoUtils; import com.android.inputmethod.latin.utils.IntentUtils; @@ -554,9 +553,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen subtypeLocale = switcherSubtypeLocale; } - final Suggest newSuggest = new Suggest(this /* Context */, subtypeLocale, - this /* SuggestInitializationListener */); final SettingsValues settingsValues = mSettings.getCurrent(); + final Suggest newSuggest = new Suggest(this /* Context */, subtypeLocale, settingsValues, + this /* SuggestInitializationListener */); if (settingsValues.mCorrectionEnabled) { newSuggest.setAutoCorrectionThreshold(settingsValues.mAutoCorrectionThreshold); } @@ -565,8 +564,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen ResearchLogger.getInstance().initSuggest(newSuggest); } // TODO: Quit setting dictionaries from LatinIME. - newSuggest.setAdditionalDictionaries(mInputLogic.mSuggest /* oldSuggest */, - mSettings.getCurrent()); + newSuggest.setAdditionalDictionaries(mInputLogic.mSuggest /* oldSuggest */, settingsValues); final Suggest oldSuggest = mInputLogic.mSuggest; mInputLogic.mSuggest = newSuggest; if (oldSuggest != null) oldSuggest.close(); |