commit 60763a06e81f550ea5d5cb69bf5e23c02b5099bb
author Keisuke Kuroyanagi <ksk@google.com> Mon Apr 28 12:29:48 2014 +0900
committer Keisuke Kuroyanagi <ksk@google.com> Mon Apr 28 16:25:10 2014 +0900
tree ecc0b326259f97c3f4ddd3a909c55dd6e3413a3e
parent 24ec8bd91bd5db077dcb16013ec3830949004d0a

Use different contacts dict name for spell checker.

Bug: 13630847
Change-Id: I016a464890d5e63794fb1288b4ce7b09adffc453

java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java

diff --git a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
index d5873d7..9254531 100644
--- a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
@@ -77,7 +77,12 @@
 
     public ContactsBinaryDictionary(final Context context, final Locale locale,
             final File dictFile) {
-        super(context, getDictName(NAME, locale, dictFile), locale, Dictionary.TYPE_CONTACTS,
+        this(context, locale, dictFile, NAME);
+    }
+
+    protected ContactsBinaryDictionary(final Context context, final Locale locale,
+            final File dictFile, final String name) {
+        super(context, getDictName(name, locale, dictFile), locale, Dictionary.TYPE_CONTACTS,
                 dictFile);
         mLocale = locale;
         mUseFirstLastBigrams = useFirstLastBigramsForLocale(locale);

java/src/com/android/inputmethod/latin/spellcheck/SynchronouslyLoadedContactsBinaryDictionary.java

diff --git a/java/src/com/android/inputmethod/latin/spellcheck/SynchronouslyLoadedContactsBinaryDictionary.java b/java/src/com/android/inputmethod/latin/spellcheck/SynchronouslyLoadedContactsBinaryDictionary.java
index 083f225..a694bf4 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/SynchronouslyLoadedContactsBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/spellcheck/SynchronouslyLoadedContactsBinaryDictionary.java
@@ -27,10 +27,11 @@
 import java.util.Locale;
 
 public final class SynchronouslyLoadedContactsBinaryDictionary extends ContactsBinaryDictionary {
+    private static final String NAME = "spellcheck_contacts";
     private final Object mLock = new Object();
 
     public SynchronouslyLoadedContactsBinaryDictionary(final Context context, final Locale locale) {
-        super(context, locale);
+        super(context, locale, null /* dictFile */, NAME);
     }
 
     @Override