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

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

1 files changed, 7 insertions, 11 deletions

diff --git a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java
index 2006a5c89..f99896109 100644
--- a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java
@@ -66,17 +66,8 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
     final private String mLocale;
     final private boolean mAlsoUseMoreRestrictiveLocales;
 
-    public UserBinaryDictionary(final Context context, final Locale locale) {
-        this(context, locale, false /* alsoUseMoreRestrictiveLocales */, null /* dictFile */);
-    }
-
-    public UserBinaryDictionary(final Context context, final Locale locale, final File dictFile) {
-        this(context, locale, false /* alsoUseMoreRestrictiveLocales */, dictFile);
-    }
-
-    public UserBinaryDictionary(final Context context, final Locale locale,
-            final boolean alsoUseMoreRestrictiveLocales, final File dictFile) {
-        this(context, locale, alsoUseMoreRestrictiveLocales, dictFile, NAME);
+    private UserBinaryDictionary(final Context context, final Locale locale, final File dictFile) {
+        this(context, locale, false /* alsoUseMoreRestrictiveLocales */, dictFile, NAME);
     }
 
     protected UserBinaryDictionary(final Context context, final Locale locale,
@@ -113,6 +104,11 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
         reloadDictionaryIfRequired();
     }
 
+    public static UserBinaryDictionary getDictionary(final Context context, final Locale locale,
+            final File dictFile) {
+        return new UserBinaryDictionary(context, locale, dictFile);
+    }
+
     @Override
     public synchronized void close() {
         if (mObserver != null) {