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

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

Merge "Clean up PC QWERTY keyboard"

parents 918336b7 7f28b3cc

java/res/xml-sw600dp/keys_pcqwerty2_right3.xml

+14 −18
Original line number Diff line number Diff line
@@ -23,36 +23,32 @@ 
>

    <switch>

        <case

            latin:keyboardLayoutSetElement="symbols"

            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"

        >

            <Key

                latin:keyLabel="["

                latin:moreKeys="{" />

            <Key

                latin:keyLabel="]"

                latin:moreKeys="}" />

            <!-- U+00A6: "¦" BROKEN BAR -->

            <Key

                latin:keyLabel="\\"

                latin:moreKeys="\\|,&#x00A6;" />

        </case>

        <default>

            <Key

                latin:keyLabel="["

                latin:keyHintLabel="{"

                latin:moreKeys="{"

                latin:additionalMoreKeys="{"

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <Key

                latin:keyLabel="]"

                latin:keyHintLabel="}"

                latin:moreKeys="}"

                latin:additionalMoreKeys="}"

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <!-- U+00A6: "¦" BROKEN BAR -->

            <Key

                latin:keyLabel="\\"

                latin:keyHintLabel="|"

                latin:moreKeys="\\|,&#x00A6;"

                latin:additionalMoreKeys="\\|"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </case>

        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->

        <default>

            <Key

                latin:keyLabel="{" />

            <Key

                latin:keyLabel="}" />

            <Key

                latin:keyLabel="|" />

        </default>

    </switch>

</merge>
 
 No newline at end of file

java/res/xml-sw600dp/keys_pcqwerty3_right2.xml

+12 −11
Original line number Diff line number Diff line
@@ -23,26 +23,27 @@ 
>

    <switch>

        <case

            latin:keyboardLayoutSetElement="symbols"

            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"

        >

            <Key

                latin:keyLabel=";"

                latin:moreKeys=":" />

                latin:keyHintLabel=":"

                latin:additionalMoreKeys=":"

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <Key

                latin:keyLabel="\'"

                latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />

                latin:keyHintLabel="&quot;"

                latin:additionalMoreKeys="&quot;"

                latin:keyStyle="hasShiftedLetterHintStyle"

                latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,%,!text/single_quotes" />

        </case>

        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->

        <default>

            <Key

                latin:keyLabel=";"

                latin:keyHintLabel=":"

                latin:moreKeys=":"

                latin:keyStyle="hasShiftedLetterHintStyle" />

                latin:keyLabel=":" />

            <Key

                latin:keyLabel="\'"

                latin:keyHintLabel="&quot;"

                latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,&quot;,!text/single_quotes"

                latin:keyStyle="hasShiftedLetterHintStyle" />

                latin:keyLabel="&quot;"

                latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/keys_pcqwerty4_right3.xml

+16 −28
Original line number Diff line number Diff line
@@ -23,28 +23,26 @@ 
>

    <switch>

        <case

            latin:keyboardLayoutSetElement="symbols"

            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"

        >

            <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK

                 U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK

                 U+2264: "≤" LESS-THAN OR EQUAL TO

                 U+2265: "≥" GREATER-THAN EQUAL TO

                 U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK

                 U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->

            <Key

                latin:keyLabel=","

                latin:keyHintLabel="&lt;"

                latin:additionalMoreKeys="&lt;"

                latin:moreKeys="!fixedColumnOrder!4,&#x2039;,&#x2064;,&#x00AB;" />

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <Key

                latin:keyLabel="."

                latin:keyHintLabel="&gt;"

                latin:additionalMoreKeys="&gt;"

                latin:moreKeys="!fixedColumnOrder!4,&#x203A;,&#x2065;,&#x00BB;" />

            <!-- U+00BF: "¿" INVERTED QUESTION MARK -->

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <Key

                latin:keyLabel="/"

                latin:keyHintLabel="\?"

                latin:additionalMoreKeys="\?"

                latin:moreKeys="&#x00BF;" />

                latin:keyStyle="hasShiftedLetterHintStyle"

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

        </case>

        <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->

        <default>

            <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK

                 U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
@@ -53,24 +51,14 @@ 
                 U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK

                 U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->

            <Key

                latin:keyLabel=","

                latin:keyHintLabel="&lt;"

                latin:additionalMoreKeys="&lt;"

                latin:moreKeys="!fixedColumnOrder!4,&#x2039;,&#x2264;,&#x00AB;"

                latin:keyStyle="hasShiftedLetterHintStyle" />

                latin:keyLabel="&lt;"

                latin:moreKeys="!fixedColumnOrder!3,&#x2039;,&#x2264;,&#x00AB;" />

            <Key

                latin:keyLabel="."

                latin:keyHintLabel="&gt;"

                latin:additionalMoreKeys="&gt;"

                latin:moreKeys="!fixedColumnOrder!4,&#x203A;,&#x2265;,&#x00BB;"

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <!-- U+00BF: "¿" INVERTED QUESTION MARK -->

                latin:keyLabel="&gt;"

                latin:moreKeys="!fixedColumnOrder!3,&#x203A;,&#x2265;,&#x00BB;" />

            <Key

                latin:keyLabel="/"

                latin:keyHintLabel="\?"

                latin:additionalMoreKeys="\?"

                latin:moreKeys="&#x00BF;"

                latin:keyStyle="hasShiftedLetterHintStyle" />

                latin:keyLabel="\?"

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

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/row_pcqwerty5.xml

+18 −4
Original line number Diff line number Diff line
@@ -38,9 +38,23 @@ 
            latin:keyStyle="spaceKeyStyle"

            latin:keyXPos="25.5%p"

            latin:keyWidth="49.0%p" />

        <switch>

            <case

                latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"

            >

                <include

                    latin:keyXPos="-9.0%p"

            latin:keyWidth="fillRight"

                    latin:keyWidth="9.0%p"

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

            </case>

            <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->

            <default>

                <include

                    latin:keyXPos="-9.0%p"

                    latin:keyWidth="9.0%p"

                    latin:backgroundType="functional"

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

            </default>

        </switch>

    </Row>

</merge>

java/res/xml-sw600dp/rowkeys_pcqwerty1.xml

+83 −89
Original line number Diff line number Diff line
@@ -21,93 +21,87 @@ 
<merge

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <switch>

        <case

            latin:keyboardLayoutSetElement="symbols"

        >

            <include

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

        </case>

        <!-- keyboardLayoutSetElement="alphabet*" -->

        <default>

            <!-- U+00AC: "¬" NOT SIGN -->

    <Key

        latin:keyLabel="`"

        latin:keyHintLabel="~"

        latin:additionalMoreKeys="~"

                latin:moreKeys="&#x00AC;"

        latin:keyStyle="hasShiftedLetterHintStyle" />

            <!-- U+00A1: "¡" NVERTED EXCLAMATION MARK -->

    <Key

        latin:keyLabel="1"

        latin:keyHintLabel="!"

        latin:additionalMoreKeys="!"

                latin:moreKeys="&#x00A1;,!text/more_keys_for_symbols_1"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        latin:keyStyle="hasShiftedLetterHintStyle"

        latin:moreKeys="!text/more_keys_for_symbols_exclamation,!text/more_keys_for_symbols_1" />

    <Key

        latin:keyLabel="2"

        latin:keyHintLabel="\@"

        latin:additionalMoreKeys="\@"

                latin:moreKeys="!text/more_keys_for_symbols_2"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        latin:keyStyle="hasShiftedLetterHintStyle"

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

    <Key

        latin:keyLabel="3"

        latin:keyHintLabel="\#"

        latin:additionalMoreKeys="\#"

                latin:moreKeys="!text/more_keys_for_symbols_3"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        latin:keyStyle="hasShiftedLetterHintStyle"

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

    <Key

        latin:keyLabel="4"

        latin:keyHintLabel="$"

        latin:additionalMoreKeys="$"

                latin:moreKeys="!text/more_keys_for_symbols_4"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        latin:keyStyle="hasShiftedLetterHintStyle"

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

    <Key

        latin:keyLabel="5"

        latin:keyHintLabel="%"

        latin:additionalMoreKeys="\\%"

                latin:moreKeys="!text/more_keys_for_symbols_5"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        latin:keyStyle="hasShiftedLetterHintStyle"

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

    <Key

        latin:keyLabel="6"

        latin:keyHintLabel="^"

        latin:additionalMoreKeys="^"

                latin:moreKeys="!text/more_keys_for_symbols_6"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        latin:keyStyle="hasShiftedLetterHintStyle"

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

    <Key

        latin:keyLabel="7"

        latin:keyHintLabel="&amp;"

        latin:additionalMoreKeys="&amp;"

                latin:moreKeys="!text/more_keys_for_symbols_7"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        latin:keyStyle="hasShiftedLetterHintStyle"

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

    <Key

        latin:keyLabel="8"

        latin:keyHintLabel="*"

        latin:additionalMoreKeys="*"

                latin:moreKeys="!text/more_keys_for_symbols_8"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        latin:keyStyle="hasShiftedLetterHintStyle"

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

    <Key

        latin:keyLabel="9"

        latin:keyHintLabel="("

        latin:additionalMoreKeys="("

                latin:moreKeys="!text/more_keys_for_symbols_9"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        latin:keyStyle="hasShiftedLetterHintStyle"

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

    <Key

        latin:keyLabel="0"

        latin:keyHintLabel=")"

        latin:additionalMoreKeys=")"

                latin:moreKeys="!text/more_keys_for_symbols_0"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        latin:keyStyle="hasShiftedLetterHintStyle"

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

    <!-- U+2013: "–" EN DASH

         U+2014: "—" EM DASH

         U+00B7: "·" MIDDLE DOT -->

    <Key

        latin:keyLabel="-"

        latin:keyHintLabel="_"

                latin:moreKeys="_"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        latin:additionalMoreKeys="_"

        latin:keyStyle="hasShiftedLetterHintStyle"

        latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />

    <!-- U+221E: "∞" INFINITY

         U+2260: "≠" NOT EQUAL TO

         U+2248: "≈" ALMOST EQUAL TO -->

    <Key

        latin:keyLabel="="

        latin:keyHintLabel="+"

                latin:moreKeys="+"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </default>

    </switch>

        latin:additionalMoreKeys="+"

        latin:keyStyle="hasShiftedLetterHintStyle"

        latin:moreKeys="&#x221E;,&#x2260;,&#x2248;" />

</merge>