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

Browse Source 
am: e784c743d9

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

Change-Id: I9c7c5eaf55bf68aea8f23e28ccf14b622c049bac
This commit is contained in:
Roozbeh Pournader
2016-05-31 01:31:58 +00:00
committed by android-build-merger
parent 80a32aa115 e784c743d9
commit f297a3da49
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) {