aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/res/values-be/donottranslate-more-keys.xml23
-rw-r--r--java/res/values-ru/donottranslate-more-keys.xml4
-rw-r--r--java/res/values/donottranslate-more-keys.xml13
-rw-r--r--java/res/xml-be/keyboard_set.xml42
-rw-r--r--java/res/xml-ru/keyboard_set.xml2
-rw-r--r--java/res/xml-sw600dp/kbd_rows_slavic.xml (renamed from java/res/xml-sw600dp/kbd_rows_russian.xml)18
-rw-r--r--java/res/xml-sw768dp/kbd_rows_slavic.xml (renamed from java/res/xml-sw768dp/kbd_rows_russian.xml)18
-rw-r--r--java/res/xml/kbd_rows_slavic.xml (renamed from java/res/xml/kbd_rows_russian.xml)20
-rw-r--r--java/res/xml/kbd_slavic.xml (renamed from java/res/xml/kbd_russian.xml)2
-rw-r--r--java/res/xml/method.xml9
10 files changed, 119 insertions, 32 deletions
diff --git a/java/res/values-be/donottranslate-more-keys.xml b/java/res/values-be/donottranslate-more-keys.xml
new file mode 100644
index 000000000..28264c4ac
--- /dev/null
+++ b/java/res/values-be/donottranslate-more-keys.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="keylabel_for_slavic_shcha">ў</string>
+ <string name="keylabel_for_slavic_i">i</string>
+</resources>
diff --git a/java/res/values-ru/donottranslate-more-keys.xml b/java/res/values-ru/donottranslate-more-keys.xml
index f7e006e84..7ae9ffbda 100644
--- a/java/res/values-ru/donottranslate-more-keys.xml
+++ b/java/res/values-ru/donottranslate-more-keys.xml
@@ -18,7 +18,5 @@
*/
-->
<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_cyrillic_soft_sign">ъ</string>
- <string name="more_keys_for_cyrillic_ha">ъ</string>
+ <string name="more_keys_for_slavic_ye">5,ё</string>
</resources>
diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml
index 6c7753999..ac175dfe7 100644
--- a/java/res/values/donottranslate-more-keys.xml
+++ b/java/res/values/donottranslate-more-keys.xml
@@ -42,9 +42,16 @@
<string name="keylabel_for_scandinavia_row2_11"></string>
<string name="more_keys_for_scandinavia_row2_10"></string>
<string name="more_keys_for_scandinavia_row2_11"></string>
- <string name="more_keys_for_cyrillic_e"></string>
- <string name="more_keys_for_cyrillic_soft_sign"></string>
- <string name="more_keys_for_cyrillic_ha"></string>
+ <string name="keylabel_for_slavic_shcha">щ</string>
+ <string name="keylabel_for_slavic_yery">ы</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_euro">¢,£,$,¥,₱</string>
<string name="more_keys_for_currency_pound">¢,$,€,¥,₱</string>
diff --git a/java/res/xml-be/keyboard_set.xml b/java/res/xml-be/keyboard_set.xml
new file mode 100644
index 000000000..e5c6ba35a
--- /dev/null
+++ b/java/res/xml-be/keyboard_set.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<KeyboardSet
+ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:keyboardLocale="be">
+ <Element
+ latin:elementName="alphabet"
+ latin:elementKeyboard="@xml/kbd_slavic" />
+ <Element
+ latin:elementName="symbols"
+ latin:elementKeyboard="@xml/kbd_symbols" />
+ <Element
+ latin:elementName="symbolsShift"
+ latin:elementKeyboard="@xml/kbd_symbols_shift" />
+ <Element
+ latin:elementName="phone"
+ latin:elementKeyboard="@xml/kbd_phone" />
+ <Element
+ latin:elementName="phoneShift"
+ latin:elementKeyboard="@xml/kbd_phone_shift" />
+ <Element
+ latin:elementName="number"
+ latin:elementKeyboard="@xml/kbd_number" />
+</KeyboardSet>
diff --git a/java/res/xml-ru/keyboard_set.xml b/java/res/xml-ru/keyboard_set.xml
index eabee5dc3..0a158d9cc 100644
--- a/java/res/xml-ru/keyboard_set.xml
+++ b/java/res/xml-ru/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="ru">
<Element
latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_russian" />
+ latin:elementKeyboard="@xml/kbd_slavic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml-sw600dp/kbd_rows_russian.xml b/java/res/xml-sw600dp/kbd_rows_slavic.xml
index 3395065ed..0a162058d 100644
--- a/java/res/xml-sw600dp/kbd_rows_russian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_slavic.xml
@@ -31,20 +31,22 @@
<Key
latin:keyLabel="ц" />
<Key
- latin:keyLabel="у" />
+ latin:keyLabel="у"
+ latin:moreKeys="@string/more_keys_for_slavic_u" />
<Key
latin:keyLabel="к" />
<Key
latin:keyLabel="е"
- latin:moreKeys="@string/more_keys_for_cyrillic_e" />
+ latin:moreKeys="@string/more_keys_for_slavic_ye" />
<Key
- latin:keyLabel="н" />
+ latin:keyLabel="н"
+ latin:moreKeys="@string/more_keys_for_slavic_en" />
<Key
latin:keyLabel="г" />
<Key
latin:keyLabel="ш" />
<Key
- latin:keyLabel="щ" />
+ latin:keyLabel="@string/keylabel_for_slavic_shcha" />
<Key
latin:keyLabel="з" />
<Key
@@ -63,7 +65,8 @@
latin:keyLabel="ф"
latin:keyXPos="2.25%p" />
<Key
- latin:keyLabel="ы" />
+ latin:keyLabel="@string/keylabel_for_slavic_yery"
+ latin:moreKeys="@string/more_keys_for_slavic_yery" />
<Key
latin:keyLabel="в" />
<Key
@@ -73,7 +76,8 @@
<Key
latin:keyLabel="р" />
<Key
- latin:keyLabel="о" />
+ latin:keyLabel="о"
+ latin:moreKeys="@string/more_keys_for_slavic_o" />
<Key
latin:keyLabel="л" />
<Key
@@ -101,7 +105,7 @@
<Key
latin:keyLabel="м" />
<Key
- latin:keyLabel="и" />
+ latin:keyLabel="@string/keylabel_for_slavic_i" />
<Key
latin:keyLabel="т" />
<Key
diff --git a/java/res/xml-sw768dp/kbd_rows_russian.xml b/java/res/xml-sw768dp/kbd_rows_slavic.xml
index eb0baf95d..4c9128d86 100644
--- a/java/res/xml-sw768dp/kbd_rows_russian.xml
+++ b/java/res/xml-sw768dp/kbd_rows_slavic.xml
@@ -34,20 +34,22 @@
<Key
latin:keyLabel="ц" />
<Key
- latin:keyLabel="у" />
+ latin:keyLabel="у"
+ latin:moreKeys="@string/more_keys_for_slavic_u" />
<Key
latin:keyLabel="к" />
<Key
latin:keyLabel="е"
- latin:moreKeys="@string/more_keys_for_cyrillic_e" />
+ latin:moreKeys="@string/more_keys_for_slavic_ye" />
<Key
- latin:keyLabel="н" />
+ latin:keyLabel="н"
+ latin:moreKeys="@string/more_keys_for_slavic_en" />
<Key
latin:keyLabel="г" />
<Key
latin:keyLabel="ш" />
<Key
- latin:keyLabel="щ" />
+ latin:keyLabel="@string/keylabel_for_slavic_shcha" />
<Key
latin:keyLabel="з" />
<Key
@@ -68,7 +70,8 @@
<Key
latin:keyLabel="ф" />
<Key
- latin:keyLabel="ы" />
+ latin:keyLabel="@string/keylabel_for_slavic_yery"
+ latin:moreKeys="@string/more_keys_for_slavic_yery" />
<Key
latin:keyLabel="в" />
<Key
@@ -78,7 +81,8 @@
<Key
latin:keyLabel="р" />
<Key
- latin:keyLabel="о" />
+ latin:keyLabel="о"
+ latin:moreKeys="@string/more_keys_for_slavic_o" />
<Key
latin:keyLabel="л" />
<Key
@@ -107,7 +111,7 @@
<Key
latin:keyLabel="м" />
<Key
- latin:keyLabel="и" />
+ latin:keyLabel="@string/keylabel_for_slavic_i" />
<Key
latin:keyLabel="т" />
<Key
diff --git a/java/res/xml/kbd_rows_russian.xml b/java/res/xml/kbd_rows_slavic.xml
index f1794e750..6536eaeb3 100644
--- a/java/res/xml/kbd_rows_russian.xml
+++ b/java/res/xml/kbd_rows_slavic.xml
@@ -37,7 +37,7 @@
<Key
latin:keyLabel="у"
latin:keyHintLabel="3"
- latin:moreKeys="3" />
+ latin:moreKeys="@string/more_keys_for_slavic_u" />
<Key
latin:keyLabel="к"
latin:keyHintLabel="4"
@@ -45,11 +45,11 @@
<Key
latin:keyLabel="е"
latin:keyHintLabel="5"
- latin:moreKeys="@string/more_keys_for_cyrillic_e" />
+ latin:moreKeys="@string/more_keys_for_slavic_ye" />
<Key
latin:keyLabel="н"
latin:keyHintLabel="6"
- latin:moreKeys="6" />
+ latin:moreKeys="@string/more_keys_for_slavic_en" />
<Key
latin:keyLabel="г"
latin:keyHintLabel="7"
@@ -59,7 +59,7 @@
latin:keyHintLabel="8"
latin:moreKeys="8" />
<Key
- latin:keyLabel="щ"
+ latin:keyLabel="@string/keylabel_for_slavic_shcha"
latin:keyHintLabel="9"
latin:moreKeys="9" />
<Key
@@ -68,7 +68,7 @@
latin:moreKeys="0" />
<Key
latin:keyLabel="х"
- latin:moreKeys="@string/more_keys_for_cyrillic_ha"
+ latin:moreKeys="@string/more_keys_for_slavic_ha"
latin:keyWidth="fillRight" />
</Row>
<Row
@@ -78,7 +78,8 @@
latin:keyLabel="ф"
latin:keyWidth="8.75%p" />
<Key
- latin:keyLabel="ы" />
+ latin:keyLabel="@string/keylabel_for_slavic_yery"
+ latin:moreKeys="@string/more_keys_for_slavic_yery" />
<Key
latin:keyLabel="в" />
<Key
@@ -88,7 +89,8 @@
<Key
latin:keyLabel="р" />
<Key
- latin:keyLabel="о" />
+ latin:keyLabel="о"
+ latin:moreKeys="@string/more_keys_for_slavic_o" />
<Key
latin:keyLabel="л" />
<Key
@@ -114,12 +116,12 @@
<Key
latin:keyLabel="м" />
<Key
- latin:keyLabel="и" />
+ latin:keyLabel="@string/keylabel_for_slavic_i" />
<Key
latin:keyLabel="т" />
<Key
latin:keyLabel="ь"
- latin:moreKeys="@string/more_keys_for_cyrillic_soft_sign" />
+ latin:moreKeys="@string/more_keys_for_slavic_soft_sign" />
<Key
latin:keyLabel="б" />
<Key
diff --git a/java/res/xml/kbd_russian.xml b/java/res/xml/kbd_slavic.xml
index 071bfd588..6207d2939 100644
--- a/java/res/xml/kbd_russian.xml
+++ b/java/res/xml/kbd_slavic.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_russian" />
+ latin:keyboardLayout="@xml/kbd_rows_slavic" />
</Keyboard>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 2b2c00c17..e9e3912f9 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -20,7 +20,8 @@
<!-- The attributes in this XML file provide configuration information -->
<!-- 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, be, 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. -->
<!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
subtype.-->
@@ -47,6 +48,12 @@
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="be"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
android:imeSubtypeLocale="cs"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-30 17:08:43 +0000