Merge "Show only up to two locales in Settings" into nyc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
a260cf8931
@@ -353,7 +353,9 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
|
|||||||
final LocaleList locales = LocalePicker.getLocales();
|
final LocaleList locales = LocalePicker.getLocales();
|
||||||
final Locale displayLocale = Locale.getDefault();
|
final Locale displayLocale = Locale.getDefault();
|
||||||
return LocaleHelper.toSentenceCase(
|
return LocaleHelper.toSentenceCase(
|
||||||
LocaleHelper.getDisplayLocaleList(locales, displayLocale), displayLocale);
|
LocaleHelper.getDisplayLocaleList(
|
||||||
|
locales, displayLocale, 2 /* Show up to two locales from the list */),
|
||||||
|
displayLocale);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void saveInputMethodSelectorVisibility(String value) {
|
private void saveInputMethodSelectorVisibility(String value) {
|
||||||
|
Reference in New Issue
Block a user