diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-07-02 02:57:50 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-07-02 02:57:50 -0700 |
| commit | d6496c091392481850c7d0103b19bc9619459d08 (patch) | |
| tree | a40453fa525753b8bcccc914f83ceb231ee45bfe /java/src/com/android/inputmethod/latin/UserBinaryDictionary.java | |
| parent | 2631e3b1954eb0f9ddd637f8ad89fd0eff495c77 (diff) | |
| parent | d113fd0be47f89b796990f1e71a756f5ceedcfad (diff) | |
| download | latinime-d6496c091392481850c7d0103b19bc9619459d08.tar.gz latinime-d6496c091392481850c7d0103b19bc9619459d08.tar.xz latinime-d6496c091392481850c7d0103b19bc9619459d08.zip | |
Merge "Fix a bug with the user dictionary locale."
Diffstat (limited to 'java/src/com/android/inputmethod/latin/UserBinaryDictionary.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/UserBinaryDictionary.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java index 8cef6fa20..60e6fa127 100644 --- a/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/UserBinaryDictionary.java @@ -34,7 +34,10 @@ import java.util.Arrays; */ public class UserBinaryDictionary extends ExpandableBinaryDictionary { - // TODO: use Words.SHORTCUT when it's public in the SDK + // The user dictionary provider uses an empty string to mean "all languages". + private static final String USER_DICTIONARY_ALL_LANGUAGES = ""; + + // TODO: use Words.SHORTCUT when we target JellyBean or above final static String SHORTCUT = "shortcut"; private static final String[] PROJECTION_QUERY; static { @@ -71,7 +74,12 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary { final boolean alsoUseMoreRestrictiveLocales) { super(context, getFilenameWithLocale(NAME, locale), Dictionary.TYPE_USER); if (null == locale) throw new NullPointerException(); // Catch the error earlier - mLocale = locale; + if (SubtypeLocale.NO_LANGUAGE.equals(locale)) { + // If we don't have a locale, insert into the "all locales" user dictionary. + mLocale = USER_DICTIONARY_ALL_LANGUAGES; + } else { + mLocale = locale; + } mAlsoUseMoreRestrictiveLocales = alsoUseMoreRestrictiveLocales; // Perform a managed query. The Activity will handle closing and re-querying the cursor // when needed. |