Merge "Fix upper case Eszett more key" (133bb854) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/internal/KeySpecParser.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -68,12 +68,20 @@ public class KeySpecParser {

		public MoreKeySpec(final String moreKeySpec, boolean needsToUpperCase, Locale locale,
		final KeyboardCodesSet codesSet) {
		mCode = toUpperCaseOfCodeForLocale(getCode(moreKeySpec, codesSet),
		needsToUpperCase, locale);
		mLabel = toUpperCaseOfStringForLocale(getLabel(moreKeySpec),
		needsToUpperCase, locale);
		final int code = toUpperCaseOfCodeForLocale(getCode(moreKeySpec, codesSet),
		needsToUpperCase, locale);
		if (code == Keyboard.CODE_UNSPECIFIED) {
		// Some letter, for example German Eszett (U+00DF: "ß"), has multiple characters
		// upper case representation ("SS").
		mCode = Keyboard.CODE_OUTPUT_TEXT;
		mOutputText = mLabel;
		} else {
		mCode = code;
		mOutputText = toUpperCaseOfStringForLocale(getOutputText(moreKeySpec),
		needsToUpperCase, locale);
		}
		mIconId = getIconId(moreKeySpec);
		}
		}