diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-10-31 08:03:38 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 08:03:38 +0000 |
| commit | a7281a766c4bd022189b981cae8731c412ce6e9e (patch) | |
| tree | 4de4df3cff097ec3b49582dcc200fd4aab770112 /java/src/com/android/inputmethod/latin/DictionaryFacilitator.java | |
| parent | a1ba8ae1bc82477474a21cac643c24533f543ac2 (diff) | |
| parent | 5840a7c6e7c6b5eea3269457affaf063fe712944 (diff) | |
| download | latinime-a7281a766c4bd022189b981cae8731c412ce6e9e.tar.gz latinime-a7281a766c4bd022189b981cae8731c412ce6e9e.tar.xz latinime-a7281a766c4bd022189b981cae8731c412ce6e9e.zip | |
am 5840a7c6: Merge "Remove Dict dependency on WordComposer and ProximityInfo"
* commit '5840a7c6e7c6b5eea3269457affaf063fe712944':
Remove Dict dependency on WordComposer and ProximityInfo
Diffstat (limited to 'java/src/com/android/inputmethod/latin/DictionaryFacilitator.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/DictionaryFacilitator.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java index 4a22cde7b..d23639a0d 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java +++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java @@ -23,7 +23,6 @@ import android.util.Pair; import android.view.inputmethod.InputMethodSubtype; import com.android.inputmethod.annotations.UsedForTesting; -import com.android.inputmethod.keyboard.ProximityInfo; import com.android.inputmethod.latin.ExpandableBinaryDictionary.UpdateEntriesForInputEventsCallback; import com.android.inputmethod.latin.NgramContext.WordInfo; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; @@ -683,7 +682,7 @@ public class DictionaryFacilitator { // TODO: Revise the way to fusion suggestion results. public SuggestionResults getSuggestionResults(final WordComposer composer, - final NgramContext ngramContext, final ProximityInfo proximityInfo, + final NgramContext ngramContext, final long proximityInfoHandle, final SettingsValuesForSuggestion settingsValuesForSuggestion, final int sessionId) { final DictionaryGroup[] dictionaryGroups = mDictionaryGroups; final SuggestionResults suggestionResults = new SuggestionResults( @@ -698,8 +697,8 @@ public class DictionaryFacilitator { ? dictionaryGroup.mWeightForGesturingInLocale : dictionaryGroup.mWeightForTypingInLocale; final ArrayList<SuggestedWordInfo> dictionarySuggestions = - dictionary.getSuggestions(composer, ngramContext, proximityInfo, - settingsValuesForSuggestion, sessionId, + dictionary.getSuggestions(composer.getComposedDataSnapshot(), ngramContext, + proximityInfoHandle, settingsValuesForSuggestion, sessionId, weightForLocale, weightOfLangModelVsSpatialModel); if (null == dictionarySuggestions) continue; suggestionResults.addAll(dictionarySuggestions); |