Generalize Russian to Slavic layout
Adding Belarusian, Kyrgyz, and Ukrainian keyboards will follows. Bug: 5738545 Change-Id: I05055d519fac8c67f728cee693b133c3dfb29047main
parent
2b2c0b574c
commit
94a3f8f243
|
@ -18,7 +18,5 @@
|
||||||
*/
|
*/
|
||||||
-->
|
-->
|
||||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||||
<string name="more_keys_for_cyrillic_e">5,ё</string>
|
<string name="more_keys_for_slavic_ye">5,ё</string>
|
||||||
<string name="more_keys_for_cyrillic_soft_sign">ъ</string>
|
|
||||||
<string name="more_keys_for_cyrillic_ha">ъ</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -42,9 +42,16 @@
|
||||||
<string name="keylabel_for_scandinavia_row2_11"></string>
|
<string name="keylabel_for_scandinavia_row2_11"></string>
|
||||||
<string name="more_keys_for_scandinavia_row2_10"></string>
|
<string name="more_keys_for_scandinavia_row2_10"></string>
|
||||||
<string name="more_keys_for_scandinavia_row2_11"></string>
|
<string name="more_keys_for_scandinavia_row2_11"></string>
|
||||||
<string name="more_keys_for_cyrillic_e"></string>
|
<string name="keylabel_for_slavic_shcha">щ</string>
|
||||||
<string name="more_keys_for_cyrillic_soft_sign"></string>
|
<string name="keylabel_for_slavic_yery">ы</string>
|
||||||
<string name="more_keys_for_cyrillic_ha"></string>
|
<string name="keylabel_for_slavic_i">и</string>
|
||||||
|
<string name="more_keys_for_slavic_u">3</string>
|
||||||
|
<string name="more_keys_for_slavic_ye">5</string>
|
||||||
|
<string name="more_keys_for_slavic_en">6</string>
|
||||||
|
<string name="more_keys_for_slavic_ha">ъ</string>
|
||||||
|
<string name="more_keys_for_slavic_yery"></string>
|
||||||
|
<string name="more_keys_for_slavic_o"></string>
|
||||||
|
<string name="more_keys_for_slavic_soft_sign">ъ</string>
|
||||||
<string name="more_keys_for_currency_dollar">¢,£,€,¥,₱</string>
|
<string name="more_keys_for_currency_dollar">¢,£,€,¥,₱</string>
|
||||||
<string name="more_keys_for_currency_euro">¢,£,$,¥,₱</string>
|
<string name="more_keys_for_currency_euro">¢,£,$,¥,₱</string>
|
||||||
<string name="more_keys_for_currency_pound">¢,$,€,¥,₱</string>
|
<string name="more_keys_for_currency_pound">¢,$,€,¥,₱</string>
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
latin:keyboardLocale="ru">
|
latin:keyboardLocale="ru">
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="alphabet"
|
latin:elementName="alphabet"
|
||||||
latin:elementKeyboard="@xml/kbd_russian" />
|
latin:elementKeyboard="@xml/kbd_slavic" />
|
||||||
<Element
|
<Element
|
||||||
latin:elementName="symbols"
|
latin:elementName="symbols"
|
||||||
latin:elementKeyboard="@xml/kbd_symbols" />
|
latin:elementKeyboard="@xml/kbd_symbols" />
|
||||||
|
|
|
@ -31,20 +31,22 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="ц" />
|
latin:keyLabel="ц" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="у" />
|
latin:keyLabel="у"
|
||||||
|
latin:moreKeys="@string/more_keys_for_slavic_u" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="к" />
|
latin:keyLabel="к" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="е"
|
latin:keyLabel="е"
|
||||||
latin:moreKeys="@string/more_keys_for_cyrillic_e" />
|
latin:moreKeys="@string/more_keys_for_slavic_ye" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="н" />
|
latin:keyLabel="н"
|
||||||
|
latin:moreKeys="@string/more_keys_for_slavic_en" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="г" />
|
latin:keyLabel="г" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="ш" />
|
latin:keyLabel="ш" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="щ" />
|
latin:keyLabel="@string/keylabel_for_slavic_shcha" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="з" />
|
latin:keyLabel="з" />
|
||||||
<Key
|
<Key
|
||||||
|
@ -63,7 +65,8 @@
|
||||||
latin:keyLabel="ф"
|
latin:keyLabel="ф"
|
||||||
latin:keyXPos="2.25%p" />
|
latin:keyXPos="2.25%p" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="ы" />
|
latin:keyLabel="@string/keylabel_for_slavic_yery"
|
||||||
|
latin:moreKeys="@string/more_keys_for_slavic_yery" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="в" />
|
latin:keyLabel="в" />
|
||||||
<Key
|
<Key
|
||||||
|
@ -73,7 +76,8 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="р" />
|
latin:keyLabel="р" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="о" />
|
latin:keyLabel="о"
|
||||||
|
latin:moreKeys="@string/more_keys_for_slavic_o" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="л" />
|
latin:keyLabel="л" />
|
||||||
<Key
|
<Key
|
||||||
|
@ -101,7 +105,7 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="м" />
|
latin:keyLabel="м" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="и" />
|
latin:keyLabel="@string/keylabel_for_slavic_i" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="т" />
|
latin:keyLabel="т" />
|
||||||
<Key
|
<Key
|
|
@ -34,20 +34,22 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="ц" />
|
latin:keyLabel="ц" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="у" />
|
latin:keyLabel="у"
|
||||||
|
latin:moreKeys="@string/more_keys_for_slavic_u" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="к" />
|
latin:keyLabel="к" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="е"
|
latin:keyLabel="е"
|
||||||
latin:moreKeys="@string/more_keys_for_cyrillic_e" />
|
latin:moreKeys="@string/more_keys_for_slavic_ye" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="н" />
|
latin:keyLabel="н"
|
||||||
|
latin:moreKeys="@string/more_keys_for_slavic_en" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="г" />
|
latin:keyLabel="г" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="ш" />
|
latin:keyLabel="ш" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="щ" />
|
latin:keyLabel="@string/keylabel_for_slavic_shcha" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="з" />
|
latin:keyLabel="з" />
|
||||||
<Key
|
<Key
|
||||||
|
@ -68,7 +70,8 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="ф" />
|
latin:keyLabel="ф" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="ы" />
|
latin:keyLabel="@string/keylabel_for_slavic_yery"
|
||||||
|
latin:moreKeys="@string/more_keys_for_slavic_yery" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="в" />
|
latin:keyLabel="в" />
|
||||||
<Key
|
<Key
|
||||||
|
@ -78,7 +81,8 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="р" />
|
latin:keyLabel="р" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="о" />
|
latin:keyLabel="о"
|
||||||
|
latin:moreKeys="@string/more_keys_for_slavic_o" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="л" />
|
latin:keyLabel="л" />
|
||||||
<Key
|
<Key
|
||||||
|
@ -107,7 +111,7 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="м" />
|
latin:keyLabel="м" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="и" />
|
latin:keyLabel="@string/keylabel_for_slavic_i" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="т" />
|
latin:keyLabel="т" />
|
||||||
<Key
|
<Key
|
|
@ -37,7 +37,7 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="у"
|
latin:keyLabel="у"
|
||||||
latin:keyHintLabel="3"
|
latin:keyHintLabel="3"
|
||||||
latin:moreKeys="3" />
|
latin:moreKeys="@string/more_keys_for_slavic_u" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="к"
|
latin:keyLabel="к"
|
||||||
latin:keyHintLabel="4"
|
latin:keyHintLabel="4"
|
||||||
|
@ -45,11 +45,11 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="е"
|
latin:keyLabel="е"
|
||||||
latin:keyHintLabel="5"
|
latin:keyHintLabel="5"
|
||||||
latin:moreKeys="@string/more_keys_for_cyrillic_e" />
|
latin:moreKeys="@string/more_keys_for_slavic_ye" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="н"
|
latin:keyLabel="н"
|
||||||
latin:keyHintLabel="6"
|
latin:keyHintLabel="6"
|
||||||
latin:moreKeys="6" />
|
latin:moreKeys="@string/more_keys_for_slavic_en" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="г"
|
latin:keyLabel="г"
|
||||||
latin:keyHintLabel="7"
|
latin:keyHintLabel="7"
|
||||||
|
@ -59,7 +59,7 @@
|
||||||
latin:keyHintLabel="8"
|
latin:keyHintLabel="8"
|
||||||
latin:moreKeys="8" />
|
latin:moreKeys="8" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="щ"
|
latin:keyLabel="@string/keylabel_for_slavic_shcha"
|
||||||
latin:keyHintLabel="9"
|
latin:keyHintLabel="9"
|
||||||
latin:moreKeys="9" />
|
latin:moreKeys="9" />
|
||||||
<Key
|
<Key
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
latin:moreKeys="0" />
|
latin:moreKeys="0" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="х"
|
latin:keyLabel="х"
|
||||||
latin:moreKeys="@string/more_keys_for_cyrillic_ha"
|
latin:moreKeys="@string/more_keys_for_slavic_ha"
|
||||||
latin:keyWidth="fillRight" />
|
latin:keyWidth="fillRight" />
|
||||||
</Row>
|
</Row>
|
||||||
<Row
|
<Row
|
||||||
|
@ -78,7 +78,8 @@
|
||||||
latin:keyLabel="ф"
|
latin:keyLabel="ф"
|
||||||
latin:keyWidth="8.75%p" />
|
latin:keyWidth="8.75%p" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="ы" />
|
latin:keyLabel="@string/keylabel_for_slavic_yery"
|
||||||
|
latin:moreKeys="@string/more_keys_for_slavic_yery" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="в" />
|
latin:keyLabel="в" />
|
||||||
<Key
|
<Key
|
||||||
|
@ -88,7 +89,8 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="р" />
|
latin:keyLabel="р" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="о" />
|
latin:keyLabel="о"
|
||||||
|
latin:moreKeys="@string/more_keys_for_slavic_o" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="л" />
|
latin:keyLabel="л" />
|
||||||
<Key
|
<Key
|
||||||
|
@ -114,12 +116,12 @@
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="м" />
|
latin:keyLabel="м" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="и" />
|
latin:keyLabel="@string/keylabel_for_slavic_i" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="т" />
|
latin:keyLabel="т" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="ь"
|
latin:keyLabel="ь"
|
||||||
latin:moreKeys="@string/more_keys_for_cyrillic_soft_sign" />
|
latin:moreKeys="@string/more_keys_for_slavic_soft_sign" />
|
||||||
<Key
|
<Key
|
||||||
latin:keyLabel="б" />
|
latin:keyLabel="б" />
|
||||||
<Key
|
<Key
|
|
@ -22,5 +22,5 @@
|
||||||
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
|
||||||
>
|
>
|
||||||
<include
|
<include
|
||||||
latin:keyboardLayout="@xml/kbd_rows_russian" />
|
latin:keyboardLayout="@xml/kbd_rows_slavic" />
|
||||||
</Keyboard>
|
</Keyboard>
|
|
@ -20,7 +20,8 @@
|
||||||
<!-- The attributes in this XML file provide configuration information -->
|
<!-- The attributes in this XML file provide configuration information -->
|
||||||
<!-- for the Input Method Manager. -->
|
<!-- for the Input Method Manager. -->
|
||||||
|
|
||||||
<!-- Keyboard: en_US, en_GB, ar, cs, da, de, de(QWERTY), es, es_US, et, fi, fr, fr_CA, fr_CH, hr, hu, it, iw, lt, lv, nb, nl, pl, pt, ru, sr, sv, tr -->
|
<!-- Keyboard: en_US, en_GB, ar, cs, da, de, de(QWERTY), es, es_US, et, fi, fr, fr_CA, fr_CH,
|
||||||
|
hr, hu, it, iw, lt, lv, nb, nl, pl, pt, ru, sr, sv, tr -->
|
||||||
<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
|
<!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
|
||||||
<!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
|
<!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
|
||||||
subtype.-->
|
subtype.-->
|
||||||
|
|
Loading…
Reference in New Issue