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

am 5563dc3a: Show all languages if user enables multiple subtypes 

* commit '5563dc3ad51a350f67ad857991aa97623a0084b8':
  Show all languages if user enables multiple subtypes
main
Satoshi Kataoka 2013-07-25 00:06:39 -07:00 committed by Android Git Automerger
parent 333245a1b9 5563dc3ad5
commit f8c4d41370
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,13 +107,19 @@ public class UserDictionaryList extends PreferenceFragment {
protected void createUserDictSettings(PreferenceGroup userDictGroup) { protected void createUserDictSettings(PreferenceGroup userDictGroup) {
final Activity activity = getActivity(); final Activity activity = getActivity();
userDictGroup.removeAll(); userDictGroup.removeAll();
final TreeSet<String> localeList = final TreeSet<String> localeSet =
UserDictionaryList.getUserDictionaryLocalesSet(activity); UserDictionaryList.getUserDictionaryLocalesSet(activity);
if (localeList.isEmpty()) { if (localeSet.size() > 1) {
// Have an "All languages" entry in the languages list if there are two or more active
// languages
localeSet.add("");
}
if (localeSet.isEmpty()) {
userDictGroup.addPreference(createUserDictionaryPreference(null, activity)); userDictGroup.addPreference(createUserDictionaryPreference(null, activity));
} else { } else {
for (String locale : localeList) { for (String locale : localeSet) {
userDictGroup.addPreference(createUserDictionaryPreference(locale, activity)); userDictGroup.addPreference(createUserDictionaryPreference(locale, activity));
} }
} }