diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-10-10 07:31:34 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-10 07:31:34 +0000 |
| commit | 8beebbf8b1b9d9d5ad01a3a31b9a2e4245a1ae4d (patch) | |
| tree | 61e6ad69db3510073bf7ededf68abeee1ed31b67 /java/src | |
| parent | 8473800f402d4cf40ab4957baef438824f023193 (diff) | |
| parent | 5d2d852eb0caaf7416c159f83d51e07b1ca87e30 (diff) | |
| download | latinime-8beebbf8b1b9d9d5ad01a3a31b9a2e4245a1ae4d.tar.gz latinime-8beebbf8b1b9d9d5ad01a3a31b9a2e4245a1ae4d.tar.xz latinime-8beebbf8b1b9d9d5ad01a3a31b9a2e4245a1ae4d.zip | |
am 5d2d852e: [ML22] Improve the language on spacebar for SLS
* commit '5d2d852eb0caaf7416c159f83d51e07b1ca87e30':
[ML22] Improve the language on spacebar for SLS
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/MainKeyboardView.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java index e7be6de4c..06f9ced92 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; 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.RichInputMethodSubtype; 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 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 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. |