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

am e94a4e2: Fix locale selection to never chose a lang-only locale.

Browse Source 
Merge commit 'e94a4e27474a410f6c9d1b2aa4ef8a8b58a8d218'

* commit 'e94a4e27474a410f6c9d1b2aa4ef8a8b58a8d218':
  Fix locale selection to never chose a lang-only locale.
This commit is contained in:
Robert Greenwalt
2009-05-06 14:07:15 -07:00
committed by The Android Open Source Project
parent c42d436b2e e94a4e2747
commit 3e3edd445b
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/com/android/settings/LocalePicker.java
View File

@@ -71,31 +71,34 @@ public class LocalePicker extends ListActivity {
for (int i = 0 ; i < origSize; i++ ) { for (int i = 0 ; i < origSize; i++ ) {
String s = locales[i]; String s = locales[i];
int len = s.length(); int len = s.length();
if (len == 2) { if (len == 5) {
Locale l = new Locale(s);
preprocess[finalSize++] = new Loc(toTitleCase(l.getDisplayLanguage()), l);
} else if (len == 5) {
String language = s.substring(0, 2); String language = s.substring(0, 2);
String country = s.substring(3, 5); String country = s.substring(3, 5);
Locale l = new Locale(language, country); Locale l = new Locale(language, country);
if (finalSize == 0) { if (finalSize == 0) {
preprocess[finalSize++] = new Loc(toTitleCase(l.getDisplayLanguage()), l); Log.v(TAG, "adding initial "+
toTitleCase(l.getDisplayLanguage()));
preprocess[finalSize++] =
new Loc(toTitleCase(l.getDisplayLanguage()), l);
} else { } else {
// check previous entry: // check previous entry:
// same lang and no country -> overwrite it with a lang-only name // same lang and a country -> upgrade to full name and
// same lang and a country -> upgrade to full name and
// insert ours with full name // insert ours with full name
// diff lang -> insert ours with lang-only name // diff lang -> insert ours with lang-only name
if (preprocess[finalSize-1].locale.getLanguage().equals(language)) { if (preprocess[finalSize-1].locale.getLanguage().equals(
String prevCountry = preprocess[finalSize-1].locale.getCountry(); language)) {
if (prevCountry.length() == 0) { Log.v(TAG, "backing up and fixing "+
preprocess[finalSize-1].locale = l; preprocess[finalSize-1].label+" to "+
preprocess[finalSize-1].label = toTitleCase(l.getDisplayLanguage()); preprocess[finalSize-1].locale.
} else { getDisplayName());
preprocess[finalSize-1].label = toTitleCase(preprocess[finalSize-1].locale.getDisplayName()); preprocess[finalSize-1].label = toTitleCase(
preprocess[finalSize++] = new Loc(toTitleCase(l.getDisplayName()), l); preprocess[finalSize-1].
} locale.getDisplayName());
Log.v(TAG, " and adding "+
toTitleCase(l.getDisplayName()));
preprocess[finalSize++] =
new Loc(toTitleCase(l.getDisplayName()), l);
} else { } else {
String displayName; String displayName;
if (s.equals("zz_ZZ")) { if (s.equals("zz_ZZ")) {
@@ -103,6 +106,7 @@ public class LocalePicker extends ListActivity {
} else { } else {
displayName = toTitleCase(l.getDisplayLanguage()); displayName = toTitleCase(l.getDisplayLanguage());
} }
Log.v(TAG, "adding "+displayName);
preprocess[finalSize++] = new Loc(displayName, l); preprocess[finalSize++] = new Loc(displayName, l);
} }
} }
@@ -114,7 +118,8 @@ public class LocalePicker extends ListActivity {
} }
int layoutId = R.layout.locale_picker_item; int layoutId = R.layout.locale_picker_item;
int fieldId = R.id.locale; int fieldId = R.id.locale;
ArrayAdapter<Loc> adapter = new ArrayAdapter<Loc>(this, layoutId, fieldId, mLocales); ArrayAdapter<Loc> adapter =
new ArrayAdapter<Loc>(this, layoutId, fieldId, mLocales);
getListView().setAdapter(adapter); getListView().setAdapter(adapter);
} }