PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve the language list in the personal dictionary

Browse Source 
Bug: 9117704
Change-Id: I0b0fdb9418baa634eeaf4b8a65aebabe291aa005
This commit is contained in:
Satoshi Kataoka
2013-06-27 19:30:52 +09:00
parent 18d2b2816a
commit f64e3b7b92
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/inputmethod/UserDictionaryList.java
View File

@@ -77,7 +77,7 @@ public class UserDictionaryList extends SettingsPreferenceFragment {
mLocale = locale; mLocale = locale;
} }
static TreeSet<String> getUserDictionaryLocalesSet(Activity activity) { public static TreeSet<String> getUserDictionaryLocalesSet(Activity activity) {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
final Cursor cursor = activity.managedQuery(UserDictionary.Words.CONTENT_URI, final Cursor cursor = activity.managedQuery(UserDictionary.Words.CONTENT_URI,
new String[] { UserDictionary.Words.LOCALE }, new String[] { UserDictionary.Words.LOCALE },
@@ -89,15 +89,21 @@ public class UserDictionaryList extends SettingsPreferenceFragment {
} else if (cursor.moveToFirst()) { } else if (cursor.moveToFirst()) {
final int columnIndex = cursor.getColumnIndex(UserDictionary.Words.LOCALE); final int columnIndex = cursor.getColumnIndex(UserDictionary.Words.LOCALE);
do { do {
String locale = cursor.getString(columnIndex); final String locale = cursor.getString(columnIndex);
localeSet.add(null != locale ? locale : ""); localeSet.add(null != locale ? locale : "");
} while (cursor.moveToNext()); } while (cursor.moveToNext());
} }
localeSet.add(Locale.getDefault().toString()); // CAVEAT: Keep this for consistency of the implementation between Keyboard and Settings
// if (!UserDictionarySettings.IS_SHORTCUT_API_SUPPORTED) {
// // For ICS, we need to show "For all languages" in case that the keyboard locale
// // is different from the system locale
// localeSet.add("");
// }
final InputMethodManager imm = final InputMethodManager imm =
(InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE); (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
final List<InputMethodInfo> imis = imm.getEnabledInputMethodList(); final List<InputMethodInfo> imis = imm.getEnabledInputMethodList();
for (InputMethodInfo imi : imis) { for (final InputMethodInfo imi : imis) {
final List<InputMethodSubtype> subtypes = final List<InputMethodSubtype> subtypes =
imm.getEnabledInputMethodSubtypeList( imm.getEnabledInputMethodSubtypeList(
imi, true /* allowsImplicitlySelectedSubtypes */); imi, true /* allowsImplicitlySelectedSubtypes */);
@@ -108,6 +114,15 @@ public class UserDictionaryList extends SettingsPreferenceFragment {
} }
} }
} }
// We come here after we have collected locales from existing user dictionary entries and
// enabled subtypes. If we already have the locale-without-country version of the system
// locale, we don't add the system locale to avoid confusion even though it's technically
// correct to add it.
if (!localeSet.contains(Locale.getDefault().getLanguage().toString())) {
localeSet.add(Locale.getDefault().toString());
}
return localeSet; return localeSet;
} }