nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 7de3d0ee: Merge "Fix: Reporting wrong main dictionary availability." 

* commit '7de3d0eed7c0a42e9f0c6c9fde9707eddc4a8ab6':
  Fix: Reporting wrong main dictionary availability.
main
Keisuke Kuroyanagi 2014-04-22 23:36:08 +00:00 committed by Android Git Automerger
parent 0735d17e0c 7de3d0eed7
commit 5ce053b806
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
View File

@ -217,9 +217,6 @@ public class DictionaryFacilitatorForSuggest {
// Replace Dictionaries. // Replace Dictionaries.
final Dictionaries newDictionaries = new Dictionaries(newLocale, newMainDict, final Dictionaries newDictionaries = new Dictionaries(newLocale, newMainDict,
newContactsDict, newUserDictionary, newUserHistoryDict, newPersonalizationDict); newContactsDict, newUserDictionary, newUserHistoryDict, newPersonalizationDict);
if (listener != null) {
listener.onUpdateMainDictionaryAvailability(newDictionaries.hasMainDict());
}
final Dictionaries oldDictionaries; final Dictionaries oldDictionaries;
synchronized (mLock) { synchronized (mLock) {
oldDictionaries = mDictionaries; oldDictionaries = mDictionaries;
@ -228,6 +225,9 @@ public class DictionaryFacilitatorForSuggest {
asyncReloadMainDictionary(context, newLocale, listener); asyncReloadMainDictionary(context, newLocale, listener);
} }
} }
if (listener != null) {
listener.onUpdateMainDictionaryAvailability(hasInitializedMainDictionary());
}
// Clean up old dictionaries. // Clean up old dictionaries.
oldDictionaries.mDictMap.clear(); oldDictionaries.mDictMap.clear();
@ -266,7 +266,7 @@ public class DictionaryFacilitatorForSuggest {
} }
} }
if (listener != null) { if (listener != null) {
listener.onUpdateMainDictionaryAvailability(mDictionaries.hasMainDict()); listener.onUpdateMainDictionaryAvailability(hasInitializedMainDictionary());
} }
latchForWaitingLoadingMainDictionary.countDown(); latchForWaitingLoadingMainDictionary.countDown();
} }