am 8ed9bcca: am 91886a31: am baec6ce1: Revert reset to ub-latinimegoogle-fava-release

* commit '8ed9bccaf2f670fd34689771d37c4e064da25b57': (240 commits)
  Don't prompt before downloading.
  Add some more logging. Why not.
  Load metadata.json from resources on DB reset.
  Small optimization to eliminate a >0 check in RichInputConnection.
  Extend laggy connection timeout for initial load.
  Fix breakage in tests.
  LatinIME portion of StatsUtil change.
  Workaround for preserving responsiveness on a slow InputConnection.
  Do not decorate committed spans.
  Do not force downloads on package replace.
  Fix the previous downloads logic to not missing any downloads.
  Detection and logging of slow input connections.
  Clear/remove all the scheduled downloads in Download Manager
  Disable download notifications.
  Cleanup before fixing getTextAfterCursor().
  Do not restrict downloads to WiFi networks.
  Import translations. DO NOT MERGE
  Revert "Remove "Personal dictionary" link from settings."
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  ...

1 files changed, 6 insertions, 58 deletions

diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java
index 63064ba3e..7233d27ab 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java
@@ -19,7 +19,6 @@ package com.android.inputmethod.latin;
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
-import android.util.LruCache;
 
 import com.android.inputmethod.annotations.UsedForTesting;
 import com.android.inputmethod.keyboard.Keyboard;
@@ -83,19 +82,6 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
     private static final Class<?>[] DICT_FACTORY_METHOD_ARG_TYPES =
             new Class[] { Context.class, Locale.class, File.class, String.class, String.class };
 
-    private LruCache<String, Boolean> mValidSpellingWordReadCache;
-    private LruCache<String, Boolean> mValidSpellingWordWriteCache;
-
-    @Override
-    public void setValidSpellingWordReadCache(final LruCache<String, Boolean> cache) {
-        mValidSpellingWordReadCache = cache;
-    }
-
-    @Override
-    public void setValidSpellingWordWriteCache(final LruCache<String, Boolean> cache) {
-        mValidSpellingWordWriteCache = cache;
-    }
-
     @Override
     public boolean isForLocale(final Locale locale) {
         return locale != null && locale.equals(mDictionaryGroup.mLocale);
@@ -221,7 +207,7 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
     }
 
     @Override
-    public void onFinishInput(Context context) {
+    public void onFinishInput() {
     }
 
     @Override
@@ -234,16 +220,6 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
         return mDictionaryGroup.mLocale;
     }
 
-    @Override
-    public boolean usesContacts() {
-        return mDictionaryGroup.getSubDict(Dictionary.TYPE_CONTACTS) != null;
-    }
-
-    @Override
-    public String getAccount() {
-        return null;
-    }
-
     @Nullable
     private static ExpandableBinaryDictionary getSubDict(final String dictType,
             final Context context, final Locale locale, final File dictFile,
@@ -365,10 +341,6 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
                 dictionarySetToCleanup.closeDict(dictType);
             }
         }
-
-        if (mValidSpellingWordWriteCache != null) {
-            mValidSpellingWordWriteCache.evictAll();
-        }
     }
 
     private void asyncReloadUninitializedMainDictionaries(final Context context,
@@ -492,10 +464,6 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
     public void addToUserHistory(final String suggestion, final boolean wasAutoCapitalized,
             @Nonnull final NgramContext ngramContext, final long timeStampInSeconds,
             final boolean blockPotentiallyOffensive) {
-        // Update the spelling cache before learning. Words that are not yet added to user history
-        // and appear in no other language model are not considered valid.
-        putWordIntoValidSpellingWordCache("addToUserHistory", suggestion);
-
         final String[] words = suggestion.split(Constants.WORD_SEPARATOR);
         NgramContext ngramContextForCurrentWord = ngramContext;
         for (int i = 0; i < words.length; i++) {
@@ -509,12 +477,6 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
         }
     }
 
-    private void putWordIntoValidSpellingWordCache(final String caller, final String word) {
-        final String spellingWord = word.toLowerCase(getLocale());
-        final boolean isValid = isValidSpellingWord(spellingWord);
-        mValidSpellingWordWriteCache.put(spellingWord, isValid);
-    }
-
     private void addWordToUserHistory(final DictionaryGroup dictionaryGroup,
             final NgramContext ngramContext, final String word, final boolean wasAutoCapitalized,
             final int timeStampInSeconds, final boolean blockPotentiallyOffensive) {
@@ -581,10 +543,6 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
         if (eventType != Constants.EVENT_BACKSPACE) {
             removeWord(Dictionary.TYPE_USER_HISTORY, word);
         }
-
-        // Update the spelling cache after unlearning. Words that are removed from user history
-        // and appear in no other language model are not considered valid.
-        putWordIntoValidSpellingWordCache("unlearnFromUserHistory", word.toLowerCase());
     }
 
     // TODO: Revise the way to fusion suggestion results.
@@ -619,14 +577,6 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
     }
 
     public boolean isValidSpellingWord(final String word) {
-        if (mValidSpellingWordReadCache != null) {
-            final String spellingWord = word.toLowerCase(getLocale());
-            final Boolean cachedValue = mValidSpellingWordReadCache.get(spellingWord);
-            if (cachedValue != null) {
-                return cachedValue;
-            }
-        }
-
         return isValidWord(word, ALL_DICTIONARY_TYPES);
     }
 
@@ -670,18 +620,16 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
         return maxFreq;
     }
 
-    private boolean clearSubDictionary(final String dictName) {
+    private void clearSubDictionary(final String dictName) {
         final ExpandableBinaryDictionary dictionary = mDictionaryGroup.getSubDict(dictName);
-        if (dictionary == null) {
-            return false;
+        if (dictionary != null) {
+            dictionary.clear();
         }
-        dictionary.clear();
-        return true;
     }
 
     @Override
-    public boolean clearUserHistoryDictionary(final Context context) {
-        return clearSubDictionary(Dictionary.TYPE_USER_HISTORY);
+    public void clearUserHistoryDictionary(final Context context) {
+        clearSubDictionary(Dictionary.TYPE_USER_HISTORY);
     }
 
     @Override