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

Unverified Commit 4bed32fa authored by Steve Kondik's avatar Steve Kondik Committed by Michael Bestas
Browse files

LatinIME: Add "more" keys to ALL the keys 

 * I'm in ur productivity, increasin' it.

Change-Id: I688bed9c3db7ef8d2c9dd5e4af72a65eb7f37966

Unbreak QWERTZ keyboards

Adding "more" keys to ALL the keys broke QWERTZ keyboards.
Fix it by adding seperate XMLs for QWERTZ.

Change-Id: Iccf10139cf02cab2a773c7085aadac8538359a16

LatinIME: Add "more" keys to ALL the keys in Greek layouts

Change-Id: I120e7b94abd71baf24c97afbd20cf2c6c76df6ef

LatinIME: Apply "Enable more keys for top row on tablets" (f6620308)
and "Add "more" keys to ALL the keys" (c561f31a) to slavik layouts.

Change-Id: Ic6fea3faecc5783d99f5257a4501e37b79f40fdf

Rearrange morekeys

  Some of the symbols such as *,!,-,+ were moved in kitkat,
  this moves the moreKeys to be inline with the moves.

Change-Id: I5aff699b268dd32a5b1e4539163e6ec153021f0a

Rearrange Slavic & Greek morekeys

* Following the previous change

Change-Id: I5b5a9bff8dd97c0bf31bc5e28245a9c14662d583
parent d22e8cce

java/res/xml-sw600dp/rows_qwertz.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        latin:keyWidth="9.0%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_qwerty2"

            latin:keyboardLayout="@xml/rowkeys_qwertz2"

            latin:keyXPos="4.5%p" />

        <Key

            latin:keyStyle="enterKeyStyle"

java/res/xml/rowkeys_east_slavic2.xml

+31 −9
Original line number Diff line number Diff line
@@ -23,37 +23,59 @@ 
>

    <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->

    <Key

        latin:keySpec="&#x0444;" />

        latin:keySpec="&#x0444;"

        latin:keyHintLabel="\@"

        latin:additionalMoreKeys="\\@" />

    <Key

        latin:keySpec="!text/keyspec_east_slavic_row2_2"

        latin:keyHintLabel="#"

        latin:additionalMoreKeys="#"

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

    <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->

    <Key

        latin:keySpec="&#x0432;" />

        latin:keySpec="&#x0432;"

        latin:keyHintLabel="$"

        latin:additionalMoreKeys="$" />

    <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->

    <Key

        latin:keySpec="&#x0430;"

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

        latin:moreKeys="!text/morekeys_cyrillic_a"

        latin:keyHintLabel="%"

        latin:additionalMoreKeys="%" />

    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->

    <Key

        latin:keySpec="&#x043F;" />

        latin:keySpec="&#x043F;"

        latin:keyHintLabel="&amp;"

        latin:additionalMoreKeys="&amp;" />

    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->

    <Key

        latin:keySpec="&#x0440;" />

        latin:keySpec="&#x0440;"

        latin:keyHintLabel="_"

        latin:additionalMoreKeys="_" />

    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->

    <Key

        latin:keySpec="&#x043E;"

        latin:keyHintLabel="/"

        latin:additionalMoreKeys="/"

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

    <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->

    <Key

        latin:keySpec="&#x043B;" />

        latin:keySpec="&#x043B;"

        latin:keyHintLabel="-"

        latin:additionalMoreKeys="-" />

    <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->

    <Key

        latin:keySpec="&#x0434;" />

        latin:keySpec="&#x0434;"

        latin:keyHintLabel="+"

        latin:additionalMoreKeys="+" />

    <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->

    <Key

        latin:keySpec="&#x0436;" />

        latin:keySpec="&#x0436;"

        latin:keyHintLabel="("

        latin:additionalMoreKeys="(" />

    <Key

        latin:keySpec="!text/keyspec_east_slavic_row2_11"

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

        latin:moreKeys="!text/morekeys_east_slavic_row2_11"

        latin:keyHintLabel=")"

        latin:additionalMoreKeys=")" />

</merge>

java/res/xml/rowkeys_east_slavic3.xml

+27 −9
Original line number Diff line number Diff line
@@ -23,29 +23,47 @@ 
>

    <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->

    <Key

        latin:keySpec="&#x044F;" />

        latin:keySpec="&#x044F;"

        latin:keyHintLabel="*"

        latin:additionalMoreKeys="*" />

    <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->

    <Key

        latin:keySpec="&#x0447;" />

        latin:keySpec="&#x0447;"

        latin:keyHintLabel="&quot;"

        latin:additionalMoreKeys="&quot;" />

    <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->

    <Key

        latin:keySpec="&#x0441;" />

        latin:keySpec="&#x0441;"

        latin:keyHintLabel="&apos;"

        latin:additionalMoreKeys="&apos;" />

    <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->

    <Key

        latin:keySpec="&#x043C;" />

        latin:keySpec="&#x043C;"

        latin:keyHintLabel=":"

        latin:additionalMoreKeys=":" />

    <Key

        latin:keySpec="!text/keyspec_east_slavic_row3_5" />

        latin:keySpec="!text/keyspec_east_slavic_row3_5"

        latin:keyHintLabel=";"

        latin:additionalMoreKeys=";" />

    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->

    <Key

        latin:keySpec="&#x0442;" />

        latin:keySpec="&#x0442;"

        latin:keyHintLabel="!"

        latin:additionalMoreKeys="!" />

    <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->

    <Key

        latin:keySpec="&#x044C;"

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

        latin:moreKeys="!text/morekeys_cyrillic_soft_sign"

        latin:keyHintLabel="\?"

        latin:additionalMoreKeys="\\?" />

    <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->

    <Key

        latin:keySpec="&#x0431;" />

        latin:keySpec="&#x0431;"

        latin:keyHintLabel="&lt;"

        latin:additionalMoreKeys="&lt;" />

    <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->

    <Key

        latin:keySpec="&#x044E;" />

        latin:keySpec="&#x044E;"

        latin:keyHintLabel="&gt;"

        latin:additionalMoreKeys="&gt;" />

</merge>

java/res/xml/rowkeys_greek2.xml

+33 −11
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ 
                 U+1F0F: "Ἇ" GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI -->

            <Key

                latin:keySpec="&#x0391;"

                latin:moreKeys="&#x0386;,&#x1FBA;,&#x1F08;,&#x1F09;,&#x1F04;,&#x1F05;,&#x1F0A;,&#x1F0B;,&#x1F0E;,&#x1F0F;" />

                latin:moreKeys="&#x0386;,&#x1FBA;,&#x1F08;,&#x1F09;,&#x1F04;,&#x1F05;,&#x1F0A;,&#x1F0B;,&#x1F0E;,&#x1F0F;"

                latin:keyHintLabel="\@"

                latin:additionalMoreKeys="\\@" />

        </case>

        <default>

            <!-- U+03B1: "α" GREEK SMALL LETTER ALPHA
@@ -67,21 +69,31 @@ 
                 U+1F87: "ᾇ" GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI -->

            <Key

                latin:keySpec="&#x03B1;"

                latin:moreKeys="&#x03AC;,&#x1F70;,&#x1FB6;,&#x1F00;,&#x1F01;,&#x1F04;,&#x1F05;,&#x1F02;,&#x1F03;,&#x1F06;,&#x1F07;,&#x1FB3;,&#x1FB4;,&#x1FB2;,&#x1FB7;,&#x1F80;,&#x1F81;,&#x1F84;,&#x1F85;,&#x1F82;,&#x1F83;,&#x1F86;,&#x1F87;" />

                latin:moreKeys="&#x03AC;,&#x1F70;,&#x1FB6;,&#x1F00;,&#x1F01;,&#x1F04;,&#x1F05;,&#x1F02;,&#x1F03;,&#x1F06;,&#x1F07;,&#x1FB3;,&#x1FB4;,&#x1FB2;,&#x1FB7;,&#x1F80;,&#x1F81;,&#x1F84;,&#x1F85;,&#x1F82;,&#x1F83;,&#x1F86;,&#x1F87;"

                latin:keyHintLabel="\@"

                latin:additionalMoreKeys="\\@" />

        </default>

    </switch>

    <!-- U+03C3: "σ" GREEK SMALL LETTER SIGMA -->

    <Key

        latin:keySpec="&#x03C3;" />

        latin:keySpec="&#x03C3;"

        latin:keyHintLabel="#"

        latin:additionalMoreKeys="#" />

    <!-- U+03B4: "δ" GREEK SMALL LETTER DELTA -->

    <Key

        latin:keySpec="&#x03B4;" />

        latin:keySpec="&#x03B4;"

        latin:keyHintLabel="€"

        latin:additionalMoreKeys="€" />

    <!-- U+03C6: "φ" GREEK SMALL LETTER PHI -->

    <Key

        latin:keySpec="&#x03C6;" />

        latin:keySpec="&#x03C6;"

        latin:keyHintLabel="%"

        latin:additionalMoreKeys="%" />

    <!-- U+03B3: "γ" GREEK SMALL LETTER GAMMA -->

    <Key

        latin:keySpec="&#x03B3;" />

        latin:keySpec="&#x03B3;"

        latin:keyHintLabel="&amp;"

        latin:additionalMoreKeys="&amp;" />

    <switch>

        <case

            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
@@ -99,7 +111,9 @@ 
                 U+1F2F: "Ἧ" GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI -->

            <Key

                latin:keySpec="&#x0397;"

                latin:moreKeys="&#x0389;,&#x1FCA;,&#x1F28;,&#x1F29;,&#x1F2C;,&#x1F2D;,&#x1F2A;,&#x1F2B;,&#x1F2E;,&#x1F2F;" />

                latin:moreKeys="&#x0389;,&#x1FCA;,&#x1F28;,&#x1F29;,&#x1F2C;,&#x1F2D;,&#x1F2A;,&#x1F2B;,&#x1F2E;,&#x1F2F;"

                latin:keyHintLabel="-"

                latin:additionalMoreKeys="-" />

        </case>

        <default>

            <!-- U+03B7: "η" GREEK SMALL LETTER ETA
@@ -128,16 +142,24 @@ 
                 U+1F97: "ᾗ" GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI -->

            <Key

                latin:keySpec="&#x03B7;"

                latin:moreKeys="&#x03AE;,&#x1F74;,&#x1FC6;,&#x1F20;,&#x1F21;,&#x1F24;,&#x1F25;,&#x1F22;,&#x1F23;,&#x1F26;,&#x1F27;,&#x1FC3;,&#x1FC4;,&#x1FC2;,&#x1FC7;,&#x1F90;,&#x1F91;,&#x1F94;,&#x1F95;,&#x1F92;,&#x1F93;,&#x1F96;,&#x1F97;" />

                latin:moreKeys="&#x03AE;,&#x1F74;,&#x1FC6;,&#x1F20;,&#x1F21;,&#x1F24;,&#x1F25;,&#x1F22;,&#x1F23;,&#x1F26;,&#x1F27;,&#x1FC3;,&#x1FC4;,&#x1FC2;,&#x1FC7;,&#x1F90;,&#x1F91;,&#x1F94;,&#x1F95;,&#x1F92;,&#x1F93;,&#x1F96;,&#x1F97;"

                latin:keyHintLabel="-"

                latin:additionalMoreKeys="-" />

        </default>

    </switch>

    <!-- U+03BE: "ξ" GREEK SMALL LETTER XI -->

    <Key

        latin:keySpec="&#x03BE;" />

        latin:keySpec="&#x03BE;"

        latin:keyHintLabel="+"

        latin:additionalMoreKeys="+" />

    <!-- U+03BA: "κ" GREEK SMALL LETTER KAPPA -->

    <Key

        latin:keySpec="&#x03BA;" />

        latin:keySpec="&#x03BA;"

        latin:keyHintLabel="("

        latin:additionalMoreKeys="(" />

    <!-- U+03BB: "λ" GREEK SMALL LETTER LAMDA -->

    <Key

        latin:keySpec="&#x03BB;" />

        latin:keySpec="&#x03BB;"

        latin:keyHintLabel=")"

        latin:additionalMoreKeys=")" />

</merge>

java/res/xml/rowkeys_greek3.xml

+24 −8
Original line number Diff line number Diff line
@@ -23,13 +23,19 @@ 
>

    <!-- U+03B6: "ζ" GREEK SMALL LETTER ZETA -->

    <Key

        latin:keySpec="&#x03B6;" />

        latin:keySpec="&#x03B6;"

        latin:keyHintLabel="*"

        latin:additionalMoreKeys="*" />

    <!-- U+03C7: "χ" GREEK SMALL LETTER CHI -->

    <Key

        latin:keySpec="&#x03C7;" />

        latin:keySpec="&#x03C7;"

        latin:keyHintLabel="&quot;"

        latin:additionalMoreKeys="&quot;" />

    <!-- U+03C8: "ψ" GREEK SMALL LETTER PSI -->

    <Key

        latin:keySpec="&#x03C8;" />

        latin:keySpec="&#x03C8;"

        latin:keyHintLabel="&apos;"

        latin:additionalMoreKeys="&apos;" />

    <switch>

        <case

            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
@@ -47,7 +53,9 @@ 
                 U+1F6F: "Ὧ" GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI -->

            <Key

                latin:keySpec="&#x03C9;"

                latin:moreKeys="&#x038F;,&#x1FFA;,&#x1F68;,&#x1F69;,&#x1F6C;,&#x1F6D;,&#x1F6A;,&#x1F6B;,&#x1F6E;,&#x1F6F;" />

                latin:moreKeys="&#x038F;,&#x1FFA;,&#x1F68;,&#x1F69;,&#x1F6C;,&#x1F6D;,&#x1F6A;,&#x1F6B;,&#x1F6E;,&#x1F6F;"

                latin:keyHintLabel=":"

                latin:additionalMoreKeys=":" />

        </case>

        <default>

            <!-- U+03C9: "ω" GREEK SMALL LETTER OMEGA
@@ -76,16 +84,24 @@ 
                 U+1FA7: "ᾧ" GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI -->

            <Key

                latin:keySpec="&#x03C9;"

                latin:moreKeys="&#x03CE;,&#x1F7C;,&#x1FF6;,&#x1F60;,&#x1F61;,&#x1F64;,&#x1F65;,&#x1F62;,&#x1F63;,&#x1F66;,&#x1F67;,&#x1FF3;,&#x1FF4;,&#x1FF2;,&#x1FF7;,&#x1FA0;,&#x1FA1;,&#x1FA4;,&#x1FA5;,&#x1FA2;,&#x1FA3;,&#x1FA6;,&#x1FA7;" />

                latin:moreKeys="&#x03CE;,&#x1F7C;,&#x1FF6;,&#x1F60;,&#x1F61;,&#x1F64;,&#x1F65;,&#x1F62;,&#x1F63;,&#x1F66;,&#x1F67;,&#x1FF3;,&#x1FF4;,&#x1FF2;,&#x1FF7;,&#x1FA0;,&#x1FA1;,&#x1FA4;,&#x1FA5;,&#x1FA2;,&#x1FA3;,&#x1FA6;,&#x1FA7;"

                latin:keyHintLabel=":"

                latin:additionalMoreKeys=":" />

        </default>

    </switch>

    <!-- U+03B2: "β" GREEK SMALL LETTER BETA -->

    <Key

        latin:keySpec="&#x03B2;" />

        latin:keySpec="&#x03B2;"

        latin:keyHintLabel=";"

        latin:additionalMoreKeys=";" />

    <!-- U+03BD: "ν" GREEK SMALL LETTER NU -->

    <Key

        latin:keySpec="&#x03BD;" />

        latin:keySpec="&#x03BD;"

        latin:keyHintLabel="!"

        latin:additionalMoreKeys="!" />

    <!-- U+03BC: "μ" GREEK SMALL LETTER MU -->

    <Key

        latin:keySpec="&#x03BC;" />

        latin:keySpec="&#x03BC;"

        latin:keyHintLabel="\?"

        latin:additionalMoreKeys="\\?" />

</merge>