nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
main
Tadashi G. Takaoka 2012-07-31 12:43:45 +09:00
parent ff2bec1ce6
commit b98b957424
9 changed files with 430 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/res/xml-sw768dp/rows_east_slavic.xml
View File

@ -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" />

8
java/res/xml/rowkeys_east_slavic1.xml
View File

@ -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>

3
java/res/xml/rowkeys_east_slavic2.xml
View File

@ -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>

776
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
View File

File diff suppressed because it is too large Load Diff

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

@ -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>

8
tools/maketext/res/values-ky/donottranslate-more-keys.xml
View File

@ -20,16 +20,20 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
<string name="keylabel_for_east_slavic_row1_9">&#x0449;</string>
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<string name="keylabel_for_east_slavic_row1_12">&#x044A;</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+0438: "и" CYRILLIC SMALL LETTER I -->
<string name="keylabel_for_east_slavic_row3_5">&#x0438;</string>
<!-- U+04AF: "ү" CYRILLIC SMALL LETTER STRAIGHT U -->
<string name="more_keys_for_cyrillic_u">&#x04AF;</string>
<!-- U+0451: "ё" CYRILLIC SMALL LETTER IO -->
<string name="more_keys_for_cyrillic_ie">&#x0451;</string>
<!-- U+04A3: "ң" CYRILLIC SMALL LETTER EN WITH DESCENDER -->
<string name="more_keys_for_cyrillic_en">&#x04A3;</string>
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<string name="more_keys_for_cyrillic_ha">&#x044A;</string>
<!-- U+04E9: "ө" CYRILLIC SMALL LETTER BARRED O -->
<string name="more_keys_for_cyrillic_o">&#x04E9;</string>
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->

8
tools/maketext/res/values-ru/donottranslate-more-keys.xml
View File

@ -20,14 +20,16 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
<string name="keylabel_for_east_slavic_row1_9">&#x0449;</string>
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<string name="keylabel_for_east_slavic_row1_12">&#x044A;</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+0438: "и" CYRILLIC SMALL LETTER I -->
<string name="keylabel_for_east_slavic_row3_5">&#x0438;</string>
<!-- U+0451: "ё" CYRILLIC SMALL LETTER IO -->
<string name="more_keys_for_cyrillic_ye">&#x0451;</string>
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<string name="more_keys_for_cyrillic_ha">&#x044A;</string>
<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>

8
tools/maketext/res/values-uk/donottranslate-more-keys.xml
View File

@ -20,12 +20,16 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
<string name="keylabel_for_east_slavic_row1_9">&#x0449;</string>
<!-- U+0457: "ї" CYRILLIC SMALL LETTER YI -->
<string name="keylabel_for_east_slavic_row1_12">&#x0457;</string>
<!-- U+0456: "і" CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
<string name="keylabel_for_east_slavic_row2_1">&#x0456;</string>
<!-- U+0454: "є" CYRILLIC SMALL LETTER UKRAINIAN IE -->
<string name="keylabel_for_east_slavic_row2_11">&#x0454;</string>
<!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
<string name="keylabel_for_east_slavic_row3_5">&#x0438;</string>
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<string name="more_keys_for_cyrillic_ha">&#x044A;</string>
<!-- U+0491: "ґ" CYRILLIC SMALL LETTER GHE WITH UPTURN -->
<string name="more_keys_for_cyrillic_ghe">&#x0491;</string>
<!-- U+0457: "ї" CYRILLIC SMALL LETTER YI -->
<string name="more_keys_for_east_slavic_row2_1">&#x0457;</string>
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->

5
tools/maketext/res/values/donottranslate-more-keys.xml
View File

@ -44,12 +44,13 @@
<string name="more_keys_for_nordic_row2_10"></string>
<string name="more_keys_for_nordic_row2_11"></string>
<string name="keylabel_for_east_slavic_row1_9"></string>
<string name="keylabel_for_east_slavic_row1_12"></string>
<string name="keylabel_for_east_slavic_row2_1"></string>
<string name="keylabel_for_east_slavic_row2_11"></string>
<string name="keylabel_for_east_slavic_row3_5"></string>
<string name="more_keys_for_cyrillic_u"></string>
<string name="more_keys_for_cyrillic_ye"></string>
<string name="more_keys_for_cyrillic_en"></string>
<string name="more_keys_for_cyrillic_ha"></string>
<string name="more_keys_for_cyrillic_ghe"></string>
<string name="more_keys_for_east_slavic_row2_1"></string>
<string name="more_keys_for_cyrillic_o"></string>
<string name="more_keys_for_cyrillic_soft_sign"></string>