diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-04-24 17:28:48 -0700 |
|---|---|---|
| committer | Keisuke Kuroyanagi <ksk@google.com> | 2014-04-24 21:36:30 -0700 |
| commit | 62c110a4c049ac1199ea2c6b2b7f41563f28258a (patch) | |
| tree | 4c74251a34d48383e5bd8c457e57230aa94864c2 /java/src | |
| parent | 3d2a9af20ac78ed29144345f0e95c3baf6d9ed6f (diff) | |
| download | latinime-62c110a4c049ac1199ea2c6b2b7f41563f28258a.tar.gz latinime-62c110a4c049ac1199ea2c6b2b7f41563f28258a.tar.xz latinime-62c110a4c049ac1199ea2c6b2b7f41563f28258a.zip | |
Handle contacts dictionary as an ExpandableBinaryDictionary.
Bug: 13755213
Change-Id: I0eb5055f9cdf5e1df337cdace9bf0919d4d365d3
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java index fa58fb09e..e276ffc84 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java +++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java @@ -72,26 +72,23 @@ public class DictionaryFacilitatorForSuggest { public final ConcurrentHashMap<String, ExpandableBinaryDictionary> mSubDictMap = CollectionUtils.newConcurrentHashMap(); // TODO: Remove sub dictionary members and use mSubDictMap. - public final ContactsBinaryDictionary mContactsDictionary; public final UserBinaryDictionary mUserDictionary; public final PersonalizationDictionary mPersonalizationDictionary; public Dictionaries() { mLocale = null; - mContactsDictionary = null; mUserDictionary = null; mPersonalizationDictionary = null; } public Dictionaries(final Locale locale, final Dictionary mainDict, - final ContactsBinaryDictionary contactsDict, final UserBinaryDictionary userDict, + final ExpandableBinaryDictionary contactsDict, final UserBinaryDictionary userDict, final ExpandableBinaryDictionary userHistoryDict, final PersonalizationDictionary personalizationDict) { mLocale = locale; // Main dictionary can be asynchronously loaded. setMainDict(mainDict); - mContactsDictionary = contactsDict; - setSubDict(Dictionary.TYPE_CONTACTS, mContactsDictionary); + setSubDict(Dictionary.TYPE_CONTACTS, contactsDict); mUserDictionary = userDict; setSubDict(Dictionary.TYPE_USER, mUserDictionary); setSubDict(Dictionary.TYPE_USER_HISTORY, userHistoryDict); @@ -172,9 +169,9 @@ public class DictionaryFacilitatorForSuggest { } // Open or move contacts dictionary. - final ContactsBinaryDictionary newContactsDict; + final ExpandableBinaryDictionary newContactsDict; if (!closeContactsDictionary && mDictionaries.hasDict(Dictionary.TYPE_CONTACTS)) { - newContactsDict = mDictionaries.mContactsDictionary; + newContactsDict = mDictionaries.getSubDict(Dictionary.TYPE_CONTACTS); } else if (useContactsDict) { newContactsDict = new ContactsBinaryDictionary(context, newLocale); } else { |