Merge "Show only up to two locales in Settings" into nyc-dev

2016-05-31 01:02:41 +00:00
parent 8eaa3de931 217b1d1581
commit a260cf8931
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -353,7 +353,9 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
        final LocaleList locales = LocalePicker.getLocales();
        final Locale displayLocale = Locale.getDefault();
        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) {