nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 4ded1af2: Improve the language list in the personal dictionary 

* commit '4ded1af21097652dcd0750d9b3f2f24df2904e25':
  Improve the language list in the personal dictionary
main
Satoshi Kataoka 2013-06-27 04:36:03 -07:00 committed by Android Git Automerger
parent 2221b89564 4ded1af210
commit 120a8da91c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/latin/userdictionary/UserDictionaryList.java
View File

@ -58,7 +58,6 @@ public class UserDictionaryList extends PreferenceFragment {
new String[] { UserDictionary.Words.LOCALE },
null, null, null);
final TreeSet<String> localeSet = new TreeSet<String>();
boolean addedAllLocale = false;
if (null == cursor) {
// The user dictionary service is not present or disabled. Return null.
return null;
@ -66,14 +65,10 @@ public class UserDictionaryList extends PreferenceFragment {
final int columnIndex = cursor.getColumnIndex(UserDictionary.Words.LOCALE);
do {
final String locale = cursor.getString(columnIndex);
final boolean allLocale = TextUtils.isEmpty(locale);
localeSet.add(allLocale ? "" : locale);
if (allLocale) {
addedAllLocale = true;
}
localeSet.add(null != locale ? locale : "");
} while (cursor.moveToNext());
}
if (!UserDictionarySettings.IS_SHORTCUT_API_SUPPORTED && !addedAllLocale) {
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("");