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

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

Browse Source 
am: a260cf8931

* commit 'a260cf8931bb51e2a8879deb8461c9444595b786':
  Show only up to two locales in Settings

Change-Id: I8da73979371f5342fc1cd636e0483b7507a06697
This commit is contained in:
Roozbeh Pournader
2016-05-31 01:20:52 +00:00
committed by android-build-merger
parent 83c2670cda a260cf8931
commit c34946b8fb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
View File

@@ -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) {