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

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

Fix east slavic keyboard layouts 

This change affects Ukrainian, Belarusian, Kyrgyz, and Russian
keyboard. The followings are the layout changes for each language
respectively.

[Ukrainian]
 * Replace useless CYRILLIC LETTER E with CYRILLIC LETTER UKRAINIAN IE.
 * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER YI
   on 10-inch tablet.
 * Add CYRILLIC LETTER GHE WITH UPTURN as more keys of CYRILLIC LETTER
   GHE.

[Belarusian]
 * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
 * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER IE
   on 10-inch tablet.

[Kyrgyz]
 * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
 * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
   HA because CYRILLIC LETTER SOFT SIGN has it.

[Russian]
 * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
   HA because CYRILLIC LETTER SOFT SIGN has it.

This change also replace misspelled "more_keys_for_cyrillic_ye" text
name with "more_keys_for_cyrillic_ie".

Bug: 6881007
Change-Id: I9e88c4e27f66225e1676f2b286a7e55b9f2cbf5b
parent ff2bec1c

java/res/xml-sw768dp/rows_east_slavic.xml

+1 −2
Original line number Diff line number Diff line
@@ -33,9 +33,8 @@ 
        <include

            latin:keyboardLayout="@xml/rowkeys_east_slavic1"

            latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />

        <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->

        <Key

            latin:keyLabel="&#x044A;" />

            latin:keyLabel="!text/keylabel_for_east_slavic_row1_12" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillRight" />

java/res/xml/rowkeys_east_slavic1.xml

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
        latin:keyLabel="&#x0435;"

        latin:keyHintLabel="5"

        latin:additionalMoreKeys="5"

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

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

    <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->

    <Key

        latin:keyLabel="&#x043D;"
@@ -58,7 +58,8 @@ 
    <Key

        latin:keyLabel="&#x0433;"

        latin:keyHintLabel="7"

        latin:additionalMoreKeys="7" />

        latin:additionalMoreKeys="7"

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

    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->

    <Key

        latin:keyLabel="&#x0448;"
@@ -75,6 +76,5 @@ 
        latin:additionalMoreKeys="0" />

    <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->

    <Key

        latin:keyLabel="&#x0445;"

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

        latin:keyLabel="&#x0445;" />

</merge>

java/res/xml/rowkeys_east_slavic2.xml

+1 −2
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 
    <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->

    <Key

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

    <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->

    <Key

        latin:keyLabel="&#x044D;" />

        latin:keyLabel="!text/keylabel_for_east_slavic_row2_11" />

</merge>

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

+396 −376

File changed.

Preview size limit exceeded, changes collapsed.

tools/maketext/res/values-be/donottranslate-more-keys.xml

+6 −2
Original line number Diff line number Diff line
@@ -20,12 +20,16 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- U+045E: "ў" CYRILLIC SMALL LETTER SHORT U -->

    <string name="keylabel_for_east_slavic_row1_9">&#x045E;</string>

    <!-- U+0451: "ё" CYRILLIC SMALL LETTER IO -->

    <string name="keylabel_for_east_slavic_row1_12">&#x0451;</string>

    <!-- U+044B: "ы" CYRILLIC SMALL LETTER YERU -->

    <string name="keylabel_for_east_slavic_row2_1">&#x044B;</string>

    <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->

    <string name="keylabel_for_east_slavic_row2_11">&#x044D;</string>

    <!-- U+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->

    <string name="keylabel_for_east_slavic_row3_5">&#x0456;</string>

    <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->

    <string name="more_keys_for_cyrillic_ha">&#x044A;</string>

    <!-- U+0451: "ё" CYRILLIC SMALL LETTER IO -->

    <string name="more_keys_for_cyrillic_ie">&#x0451;</string>

    <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->

    <string name="more_keys_for_cyrillic_soft_sign">&#x044A;</string>

</resources>