From bc051a561f1766e5cea2866468c769f5cb346ffb Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Mon, 6 Oct 2014 21:27:16 +0900 Subject: [ML14] Forward the locale list to relevant places, again Diff: +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java @@ -735,7 +735,7 @@ public class KeyboardBuilder { private boolean matchLocaleCodes(TypedArray caseAttr, final Locale[] locales) { // TODO: adujst this for multilingual input - return matchString(caseAttr, R.styleable.Keyboard_Case_languageCode, locales[0].toString()); + return matchString(caseAttr, R.styleable.Keyboard_Case_localeCode, locales[0].toString()); } private boolean matchLanguageCodes(TypedArray caseAttr, Locale[] locales) { Change-Id: Icefac18dd6d5fea97f591177cf8df1ba6de7f4f0 --- java/src/com/android/inputmethod/keyboard/MainKeyboardView.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to '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 cded2cb8c..ad30b746e 100644 --- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java @@ -875,6 +875,11 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack // Layout language name on spacebar. private String layoutLanguageOnSpacebar(final Paint paint, final RichInputMethodSubtype subtype, final int width) { + if (mLanguageOnSpacebarFormatType == LanguageOnSpacebarHelper.FORMAT_TYPE_MULTIPLE) { + // TODO: return an appropriate string + return ""; + } + // Choose appropriate language name to fit into the width. if (mLanguageOnSpacebarFormatType == LanguageOnSpacebarHelper.FORMAT_TYPE_FULL_LOCALE) { final String fullText = subtype.getFullDisplayName(); -- cgit v1.2.3