Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5946838b authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Fix upper case Eszett more key

Bug: 6773873
Change-Id: I1a533c729c312a53663fb142cb6fcb4915b53206
parent 7aeb7ef1
Loading
Loading
Loading
Loading
+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);
        }
    }