diff options
author | 2015-02-09 17:09:15 -0800 | |
---|---|---|
committer | 2015-02-24 17:59:47 -0800 | |
commit | 2b8d763c65b2482fcdc7efe301907ac18133fa42 (patch) | |
tree | b9e404c9930d6a0288a0f2a2e94466056915aa0d /java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java | |
parent | a3ac6f24cc6a22651e09a1bf7fc018d4af945333 (diff) | |
download | latinime-2b8d763c65b2482fcdc7efe301907ac18133fa42.tar.gz latinime-2b8d763c65b2482fcdc7efe301907ac18133fa42.tar.xz latinime-2b8d763c65b2482fcdc7efe301907ac18133fa42.zip |
Pass ComposedData to the decoder instead of WordComposer.
Change-Id: I8bd544d03d9087a02294b08a9986cad229dae795
Diffstat (limited to 'java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java')
-rw-r--r-- | java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java index 2123567b7..e96300020 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java +++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java @@ -25,6 +25,7 @@ import com.android.inputmethod.annotations.UsedForTesting; import com.android.inputmethod.keyboard.KeyboardLayout; import com.android.inputmethod.latin.NgramContext.WordInfo; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; +import com.android.inputmethod.latin.common.ComposedData; import com.android.inputmethod.latin.common.Constants; import com.android.inputmethod.latin.personalization.UserHistoryDictionary; import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion; @@ -666,7 +667,7 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator { // TODO: Revise the way to fusion suggestion results. @Override - public SuggestionResults getSuggestionResults(WordComposer composer, + public SuggestionResults getSuggestionResults(ComposedData composedData, NgramContext ngramContext, long proximityInfoHandle, SettingsValuesForSuggestion settingsValuesForSuggestion, int sessionId, int inputStyle, KeyboardLayout keyboardLayout) { @@ -679,11 +680,11 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator { for (final String dictType : DICTIONARY_TYPES_FOR_SUGGESTIONS) { final Dictionary dictionary = dictionaryGroup.getDict(dictType); if (null == dictionary) continue; - final float weightForLocale = composer.isBatchMode() + final float weightForLocale = composedData.mIsBatchMode ? dictionaryGroup.mWeightForGesturingInLocale : dictionaryGroup.mWeightForTypingInLocale; final ArrayList<SuggestedWordInfo> dictionarySuggestions = - dictionary.getSuggestions(composer.getComposedDataSnapshot(), ngramContext, + dictionary.getSuggestions(composedData, ngramContext, proximityInfoHandle, settingsValuesForSuggestion, sessionId, weightForLocale, weightOfLangModelVsSpatialModel); if (null == dictionarySuggestions) continue; |