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 am: a260cf8931

Browse Source 
am: c34946b8fb

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

Change-Id: I14a74579f9742586c7a3ebec7adc2d1d73da32ab
This commit is contained in:
Roozbeh Pournader
2016-05-31 01:25:59 +00:00
committed by android-build-merger
parent ec57cbf8fc c34946b8fb
commit e784c743d9
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 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) {