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

Commit cc940055 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 7a39bd44: Shift+Smiley key will register newline character of textMultiLine 

* commit '7a39bd44':
  Shift+Smiley key will register newline character of textMultiLine
parents 67cba8ea 7a39bd44

java/res/values/attrs.xml

+7 −4
Original line number Diff line number Diff line
@@ -232,10 +232,7 @@ 
             been replaced, those remaining entries are appended at the end of moreKeys. -->

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

        <!-- Maximum column of more keys keyboard -->

        <attr name="maxMoreKeysColumn" format="integer">

            <!-- This should be aligned with  -->

            <flag name="fixedWidthMoreKeysColumn" value="0x8000000" />

        </attr>

        <attr name="maxMoreKeysColumn" format="integer" />

        <attr name="backgroundType" format="enum">

            <!-- This should be aligned with Key.BACKGROUND_TYPE_* -->

            <enum name="normal" value="0" />
@@ -281,10 +278,13 @@ 
            <!-- If true, use keyShiftedLetterHintActivatedColor for the shifted letter hint and

                 keyTextInactivatedColor for the primary key top label. -->

            <flag name="shiftedLetterActivated" value="0x10000" />

            <!-- If true, use EditorInfo.actionLabel for the key label. -->

            <flag name="fromCustomActionLabel" value="0x20000" />

        </attr>

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

        <attr name="keyIcon" format="enum">

            <!-- This should be aligned with the KeyboardIconsSet.ICON_* -->

            <enum name="iconUndefined" value="0" />

            <enum name="iconShiftKey" value="1" />

            <enum name="iconDeleteKey" value="2" />

            <enum name="iconSettingsKey" value="3" />
@@ -368,6 +368,7 @@ 
        <attr name="clobberSettingsKey" format="boolean" />

        <attr name="shortcutKeyEnabled" format="boolean" />

        <attr name="hasShortcutKey" format="boolean" />

        <attr name="isMultiLine" format="boolean" />

        <attr name="imeAction" format="enum">

            <!-- This should be aligned with EditorInfo.IME_ACTION_* -->

            <enum name="actionUnspecified" value="0" />
@@ -378,6 +379,8 @@ 
            <enum name="actionNext" value="5" />

            <enum name="actionDone" value="6" />

            <enum name="actionPrevious" value="7" />

            <!--  This should be aligned with KeyboardId.IME_ACTION_* -->

            <enum name="actionCustomLabel" value="0x100" />

        </attr>

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

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

java/res/values/keycodes.xml

+5 −4
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ 
    <integer name="key_space">32</integer>

    <integer name="key_shift">-1</integer>

    <integer name="key_switch_alpha_symbol">-2</integer>

    <integer name="key_output_text">-4</integer>

    <integer name="key_delete">-5</integer>

    <integer name="key_settings">-6</integer>

    <integer name="key_shortcut">-7</integer>

    <integer name="key_output_text">-3</integer>

    <integer name="key_delete">-4</integer>

    <integer name="key_settings">-5</integer>

    <integer name="key_shortcut">-6</integer>

    <integer name="key_action_enter">-7</integer>

    <integer name="key_unspecified">-9</integer>

</resources>

java/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ 
    <string name="label_go_key">Go</string>

    <!-- Label for soft enter key when it performs NEXT action.  Must be short to fit on key! [CHAR LIMIT=5] -->

    <string name="label_next_key">Next</string>

    <!-- Label for soft enter key when it performs PREVIOUS action.  Must be short to fit on key! [CHAR LIMIT=5] -->

    <string name="label_previous_key">Prev</string>

    <!-- Label for soft enter key when it performs DONE action.  Must be short to fit on key! [CHAR LIMIT=5] -->

    <string name="label_done_key">Done</string>

    <!-- Label for soft enter key when it performs SEND action.  Must be short to fit on key! [CHAR LIMIT=5] -->

java/res/xml-sw600dp/key_styles_common.xml

+2 −6
Original line number Diff line number Diff line
@@ -89,12 +89,8 @@ 
        latin:keyIcon="iconDeleteKey"

        latin:keyActionFlags="isRepeatable|noKeyPreview"

        latin:backgroundType="functional" />

    <key-style

        latin:styleName="returnKeyStyle"

        latin:code="@integer/key_return"

        latin:keyIcon="iconReturnKey"

        latin:keyActionFlags="noKeyPreview"

        latin:backgroundType="functional" />

    <include

        latin:keyboardLayout="@xml/key_styles_enter_tablet" />

    <key-style

        latin:styleName="spaceKeyStyle"

        latin:code="@integer/key_space"

java/res/xml-sw600dp/row_qwerty2.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
            latin:keyLabel="l"

            latin:moreKeys="@string/more_keys_for_l" />

        <Key

            latin:keyStyle="returnKeyStyle"

            latin:keyStyle="enterKeyStyle"

            latin:keyXPos="-14.6%p"

            latin:keyWidth="fillBoth" />

    </Row>