am 61fe2883: Merge "Create factory methods for sub dicts."

* commit '61fe28831d93a829f67694a342b6c94bdc7732ea':
  Create factory methods for sub dicts.

1 files changed, 6 insertions, 9 deletions

diff --git a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
index 09d0ea210..30b3433bb 100644
--- a/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ContactsBinaryDictionary.java
@@ -61,9 +61,6 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
     /** The number of contacts in the most recent dictionary rebuild. */
     static private int sContactCountAtLastRebuild = 0;
 
-    /** The locale for this contacts dictionary. Controls name bigram predictions. */
-    public final Locale mLocale;
-
     private ContentObserver mObserver;
 
     /**
@@ -71,11 +68,7 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
      */
     private final boolean mUseFirstLastBigrams;
 
-    public ContactsBinaryDictionary(final Context context, final Locale locale) {
-        this(context, locale, null /* dictFile */);
-    }
-
-    public ContactsBinaryDictionary(final Context context, final Locale locale,
+    private ContactsBinaryDictionary(final Context context, final Locale locale,
             final File dictFile) {
         this(context, locale, dictFile, NAME);
     }
@@ -84,12 +77,16 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
             final File dictFile, final String name) {
         super(context, getDictName(name, locale, dictFile), locale, Dictionary.TYPE_CONTACTS,
                 dictFile);
-        mLocale = locale;
         mUseFirstLastBigrams = useFirstLastBigramsForLocale(locale);
         registerObserver(context);
         reloadDictionaryIfRequired();
     }
 
+    public static ContactsBinaryDictionary getDictionary(final Context context, final Locale locale,
+            final File dictFile) {
+        return new ContactsBinaryDictionary(context, locale, dictFile);
+    }
+
     private synchronized void registerObserver(final Context context) {
         if (mObserver != null) return;
         ContentResolver cres = context.getContentResolver();