diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-13 04:55:15 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-02-13 04:55:16 +0000 |
| commit | 8dd47029f129cf7077c091170a8f7eeb88dd0ccf (patch) | |
| tree | 480d3dfc41338e2d04ad9aa1bd7d78644e2eaca1 /java/src/com/android/inputmethod/latin/UserBinaryDictionary.java | |
| parent | c3cfabd0ebdaf51251e4ec14ad46ba4d476bacca (diff) | |
| parent | 870d89b1a81c263b3de96d0d035c2fb40071eed8 (diff) | |
| download | latinime-8dd47029f129cf7077c091170a8f7eeb88dd0ccf.tar.gz latinime-8dd47029f129cf7077c091170a8f7eeb88dd0ccf.tar.xz latinime-8dd47029f129cf7077c091170a8f7eeb88dd0ccf.zip | |
Merge "Refactor dictionary constructor"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/UserBinaryDictionary.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/UserBinaryDictionary.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java index 8011247c6..2a195f58b 100644 --- a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java @@ -28,7 +28,6 @@ import android.provider.UserDictionary.Words; import android.text.TextUtils; import android.util.Log; -import com.android.inputmethod.annotations.UsedForTesting; import com.android.inputmethod.compat.UserDictionaryCompatUtils; import com.android.inputmethod.latin.utils.LocaleUtils; import com.android.inputmethod.latin.utils.SubtypeLocaleUtils; @@ -78,19 +77,17 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary { final public boolean mEnabled; public UserBinaryDictionary(final Context context, final Locale locale) { - this(context, locale, false); + this(context, locale, false /* alsoUseMoreRestrictiveLocales */, null /* dictFile */); } - // Dummy constructor for tests. - @UsedForTesting - public UserBinaryDictionary(final Context context, final Locale locale, final File file) { - this(context, locale); + 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) { - super(context, getDictNameWithLocale(NAME, locale), locale, Dictionary.TYPE_USER, - false /* isUpdatable */); + final boolean alsoUseMoreRestrictiveLocales, final File dictFile) { + super(context, getDictName(NAME, locale, dictFile), locale, Dictionary.TYPE_USER, + false /* isUpdatable */, dictFile); if (null == locale) throw new NullPointerException(); // Catch the error earlier final String localeStr = locale.toString(); if (SubtypeLocaleUtils.NO_LANGUAGE.equals(localeStr)) { |