commit eb35b01c6f1ce9a334d609a1d963a7f9684f64d9
author Jean Chalard <jchalard@google.com> Thu Oct 09 17:50:42 2014 +0900
committer The Android Automerger <android-build@google.com> Fri Oct 10 08:06:31 2014 -0700
tree dd9cab834f84947646f4e0522fd95a4dd0ecd120
parent 70d353a5b8a0609614a9798a0504b11ce3ce8e60

[ML22] Improve the language on spacebar for SLS

Bug: 11230254
Change-Id: Ib54be1a2a77b6e80cdff1af89a7b4203ea859716

java/src/com/android/inputmethod/keyboard/MainKeyboardView.java

diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index e7be6de..06f9ced 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -28,6 +28,7 @@
 import android.graphics.Paint.Align;
 import android.graphics.Typeface;
 import android.preference.PreferenceManager;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -57,8 +58,10 @@
 import com.android.inputmethod.latin.SuggestedWords;
 import com.android.inputmethod.latin.settings.DebugSettings;
 import com.android.inputmethod.latin.utils.CoordinateUtils;
+import com.android.inputmethod.latin.utils.StringUtils;
 import com.android.inputmethod.latin.utils.TypefaceUtils;
 
+import java.util.Locale;
 import java.util.WeakHashMap;
 
 /**
@@ -855,8 +858,13 @@
     private String layoutLanguageOnSpacebar(final Paint paint,
             final RichInputMethodSubtype subtype, final int width) {
         if (mLanguageOnSpacebarFormatType == LanguageOnSpacebarHelper.FORMAT_TYPE_MULTIPLE) {
-            // TODO: return an appropriate string
-            return "";
+            final Locale[] locales = subtype.getLocales();
+            final String[] languages = new String[locales.length];
+            for (int i = 0; i < locales.length; ++i) {
+                languages[i] = StringUtils.toUpperCaseOfStringForLocale(
+                        locales[i].getLanguage(), true /* needsToUpperCase */, Locale.ROOT);
+            }
+            return TextUtils.join(" / ", languages);
         }
 
         // Choose appropriate language name to fit into the width.