| commit | b08a9e021c2e5be7375295858b28bf8c4b9767b9 | [log] [tgz] |
|---|---|---|
| author | Tadashi G. Takaoka <takaoka@google.com> | Mon Feb 24 08:54:54 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Feb 24 08:54:55 2014 +0000 |
| tree | 399975df124da2697a22c94649a6eb382713eea1 | |
| parent | 66c96e881330538f2dbd85e97d9c636c06af5826 [diff] | |
| parent | da500b7ec3093178922140cb67beca1e3578661d [diff] |
Merge "Revert "Prepare for changing text color for functional keys""
diff --git a/dictionaries/en_GB_wordlist.combined.gz b/dictionaries/en_GB_wordlist.combined.gz index 50647b8..ff69f64 100644 --- a/dictionaries/en_GB_wordlist.combined.gz +++ b/dictionaries/en_GB_wordlist.combined.gz Binary files differ
diff --git a/dictionaries/en_US_wordlist.combined.gz b/dictionaries/en_US_wordlist.combined.gz index 7dd4b4e..2c80bc4 100644 --- a/dictionaries/en_US_wordlist.combined.gz +++ b/dictionaries/en_US_wordlist.combined.gz Binary files differ
diff --git a/dictionaries/en_wordlist.combined.gz b/dictionaries/en_wordlist.combined.gz index 874a5de..06fb64f 100644 --- a/dictionaries/en_wordlist.combined.gz +++ b/dictionaries/en_wordlist.combined.gz Binary files differ
diff --git a/dictionaries/ru_wordlist.combined.gz b/dictionaries/ru_wordlist.combined.gz index 572314d..8e654e9 100644 --- a/dictionaries/ru_wordlist.combined.gz +++ b/dictionaries/ru_wordlist.combined.gz Binary files differ
diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict index 09b6992..57f3fe7 100644 --- a/java/res/raw/main_en.dict +++ b/java/res/raw/main_en.dict Binary files differ
diff --git a/java/res/raw/main_ru.dict b/java/res/raw/main_ru.dict index 7dec624..c2b1e67 100644 --- a/java/res/raw/main_ru.dict +++ b/java/res/raw/main_ru.dict Binary files differ
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java index 43d4ba4..e767e4b 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java +++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
@@ -232,6 +232,12 @@ return null != mPersonalizationDictionary; } + public void flushPersonalizationDictionary() { + if (hasPersonalizationDictionary()) { + mPersonalizationDictionary.flush(); + } + } + public void waitForLoadingMainDictionary(final long timeout, final TimeUnit unit) throws InterruptedException { mLatchForWaitingLoadingMainDictionary.await(timeout, unit);
diff --git a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java index 8f7378c..d3734d6 100644 --- a/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java +++ b/java/src/com/android/inputmethod/latin/personalization/DecayingExpandableBinaryDictionaryBase.java
@@ -68,6 +68,11 @@ dumpAllWordsForDebug(); } // Flush pending writes. + flush(); + // TODO: Quit depending on finalize() and really close the dictionary file. + } + + public void flush() { asyncFlushBinaryDictionary(); }