commit aa56eef3fd67e8eb20df96850e0175fb15b3f415
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 31 16:22:39 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 31 16:22:40 2016 +0000
tree 1706ee986613d8931a33290e729b0bc4dcfdf4d1
parent a260cf8931bb51e2a8879deb8461c9444595b786
parent 9a18500160423793ba56d89a5950d9aa8dec7096

Merge "Import translations. DO NOT MERGE" into nyc-dev

src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 5356968..2db75a6 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -353,7 +353,9 @@
         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) {