diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-05-12 04:48:51 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-12 04:48:51 +0000 |
| commit | 924f8ac6a11f621b65b2430753c06dc4cc7cc2cc (patch) | |
| tree | 2d3b3ab24e6606c6f6c7c7e05f3e0eda68c84ebc /java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java | |
| parent | 96fca77fbbd31fb7c9f8ea69286549ea359ddba6 (diff) | |
| parent | 47c76f0a4574e808456a84b89986ca34d1498a81 (diff) | |
| download | latinime-924f8ac6a11f621b65b2430753c06dc4cc7cc2cc.tar.gz latinime-924f8ac6a11f621b65b2430753c06dc4cc7cc2cc.tar.xz latinime-924f8ac6a11f621b65b2430753c06dc4cc7cc2cc.zip | |
am 47c76f0a: Merge "Add contextual dictionary to the dictionary facilitator."
* commit '47c76f0a4574e808456a84b89986ca34d1498a81':
Add contextual dictionary to the dictionary facilitator.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java index 9735645cb..ea9691a5a 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java +++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java @@ -23,6 +23,7 @@ import android.util.Log; import com.android.inputmethod.annotations.UsedForTesting; import com.android.inputmethod.keyboard.ProximityInfo; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; +import com.android.inputmethod.latin.personalization.ContextualDictionary; import com.android.inputmethod.latin.personalization.PersonalizationDictionary; import com.android.inputmethod.latin.personalization.UserHistoryDictionary; import com.android.inputmethod.latin.utils.CollectionUtils; @@ -63,7 +64,8 @@ public class DictionaryFacilitatorForSuggest { Dictionary.TYPE_USER_HISTORY, Dictionary.TYPE_PERSONALIZATION, Dictionary.TYPE_USER, - Dictionary.TYPE_CONTACTS + Dictionary.TYPE_CONTACTS, + Dictionary.TYPE_CONTEXTUAL }; private static final Map<String, Class<? extends ExpandableBinaryDictionary>> @@ -74,6 +76,7 @@ public class DictionaryFacilitatorForSuggest { DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_PERSONALIZATION, PersonalizationDictionary.class); DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_USER, UserBinaryDictionary.class); DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_CONTACTS, ContactsBinaryDictionary.class); + DICT_TYPE_TO_CLASS.put(Dictionary.TYPE_CONTEXTUAL, ContextualDictionary.class); } private static final String DICT_FACTORY_METHOD_NAME = "getDictionary"; @@ -201,6 +204,7 @@ public class DictionaryFacilitatorForSuggest { if (usePersonalizedDicts) { subDictTypesToUse.add(Dictionary.TYPE_USER_HISTORY); subDictTypesToUse.add(Dictionary.TYPE_PERSONALIZATION); + subDictTypesToUse.add(Dictionary.TYPE_CONTEXTUAL); } final Dictionary newMainDict; |