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

Commit 48ea5280 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Consolidate keyOutputText with keyLabel attribute"

parents d645db1e d6f147e1

java/res/values/attrs.xml

+0 −3
Original line number Diff line number Diff line
@@ -276,9 +276,6 @@ 
            <flag name="altCodeWhileTyping" value="0x04" />

            <flag name="enableLongPress" value="0x08" />

        </attr>

        <!-- TODO: Remove keyOutputText attribute and consolidate with keySpec. -->

        <!-- The string of characters to output when this key is pressed. -->

        <attr name="keyOutputText" format="string" />

        <!-- TODO: Rename keyLabel to keySpec. -->

        <!-- The label to display on the key. -->

        <attr name="keyLabel" format="string" />

java/res/xml-sw600dp/key_styles_common.xml

+1 −2
Original line number Diff line number Diff line
@@ -184,8 +184,7 @@ 
        latin:parentStyle="baseForLayoutSwitchKeyStyle" />

    <key-style

        latin:styleName="comKeyStyle"

        latin:keyLabel="!text/keylabel_for_popular_domain"

        latin:keyLabel="!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain"

        latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"

        latin:keyOutputText="!text/keylabel_for_popular_domain"

        latin:moreKeys="!text/more_keys_for_popular_domain" />

</merge>

java/res/xml/key_styles_common.xml

+1 −2
Original line number Diff line number Diff line
@@ -184,9 +184,8 @@ 
        latin:parentStyle="baseForToSymbolKeyStyle" />

    <key-style

        latin:styleName="comKeyStyle"

        latin:keyLabel="!text/keylabel_for_popular_domain"

        latin:keyLabel="!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain"

        latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"

        latin:keyOutputText="!text/keylabel_for_popular_domain"

        latin:moreKeys="!text/more_keys_for_popular_domain"

        latin:backgroundType="functional" />

</merge>

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

+1 −5
Original line number Diff line number Diff line
@@ -347,12 +347,8 @@ public class Key implements Comparable<Key> { 
            mHintLabel = StringUtils.toUpperCaseOfStringForLocale(style.getString(keyAttr,

                    R.styleable.Keyboard_Key_keyHintLabel), needsToUpperCase, locale);

        }

        final String outputTextInAttr = style.getString(

                keyAttr, R.styleable.Keyboard_Key_keyOutputText);

        final String rawOutputText = (outputTextInAttr != null) ? outputTextInAttr

                : KeySpecParser.getOutputText(keySpec);

        String outputText = StringUtils.toUpperCaseOfStringForLocale(

                rawOutputText, needsToUpperCase, locale);

                KeySpecParser.getOutputText(keySpec), needsToUpperCase, locale);

        // Choose the first letter of the label as primary code if not specified.

        if (code == CODE_UNSPECIFIED && TextUtils.isEmpty(outputText)

                && !TextUtils.isEmpty(mLabel)) {

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

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ public final class KeyStylesSet { 
            readString(keyAttr, R.styleable.Keyboard_Key_code);

            readString(keyAttr, R.styleable.Keyboard_Key_altCode);

            readString(keyAttr, R.styleable.Keyboard_Key_keyLabel);

            readString(keyAttr, R.styleable.Keyboard_Key_keyOutputText);

            readString(keyAttr, R.styleable.Keyboard_Key_keyHintLabel);

            readStringArray(keyAttr, R.styleable.Keyboard_Key_moreKeys);

            readStringArray(keyAttr, R.styleable.Keyboard_Key_additionalMoreKeys);