From 2f85034c5d389aff7a4815d6a169e542b27b2298 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 12 Mar 2012 11:29:27 +0900
Subject: [PATCH] Breakdown Slavic keyboard into rows

Change-Id: Iff2048839a51e14351ba235ef9d7f5ecbef159e3
---
 java/res/xml-sw600dp/rowkeys_slavic1.xml |  59 +++++++++++
 java/res/xml-sw600dp/rows_slavic.xml     | 101 ++----------------
 java/res/xml-sw768dp/rows_slavic.xml     | 101 ++----------------
 java/res/xml/rowkeys_slavic1.xml         |  80 +++++++++++++++
 java/res/xml/rowkeys_slavic2.xml         |  58 +++++++++++
 java/res/xml/rowkeys_slavic3.xml         |  51 +++++++++
 java/res/xml/rows_slavic.xml             | 125 ++---------------------
 7 files changed, 266 insertions(+), 309 deletions(-)
 create mode 100644 java/res/xml-sw600dp/rowkeys_slavic1.xml
 create mode 100644 java/res/xml/rowkeys_slavic1.xml
 create mode 100644 java/res/xml/rowkeys_slavic2.xml
 create mode 100644 java/res/xml/rowkeys_slavic3.xml

diff --git a/java/res/xml-sw600dp/rowkeys_slavic1.xml b/java/res/xml-sw600dp/rowkeys_slavic1.xml
new file mode 100644
index 000000000..6ceb97017
--- /dev/null
+++ b/java/res/xml-sw600dp/rowkeys_slavic1.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+    <Key
+        latin:keyLabel="&#x0439;" />
+    <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
+    <Key
+        latin:keyLabel="&#x0446;" />
+    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
+    <Key
+        latin:keyLabel="&#x0443;"
+        latin:moreKeys="@string/more_keys_for_cyrillic_u" />
+    <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
+    <Key
+        latin:keyLabel="&#x043A;" />
+    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
+    <Key
+        latin:keyLabel="&#x0435;"
+        latin:moreKeys="@string/more_keys_for_cyrillic_ye" />
+    <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
+    <Key
+        latin:keyLabel="&#x043D;"
+        latin:moreKeys="@string/more_keys_for_cyrillic_en" />
+    <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
+    <Key
+        latin:keyLabel="&#x0433;" />
+    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
+    <Key
+        latin:keyLabel="&#x0448;" />
+    <Key
+        latin:keyLabel="@string/keylabel_for_cyrillic_shcha" />
+    <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
+    <Key
+        latin:keyLabel="&#x0437;" />
+    <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
+    <Key
+        latin:keyLabel="&#x0445;" />
+</merge>
diff --git a/java/res/xml-sw600dp/rows_slavic.xml b/java/res/xml-sw600dp/rows_slavic.xml
index 7ff63bc0e..9a9ff74fa 100644
--- a/java/res/xml-sw600dp/rows_slavic.xml
+++ b/java/res/xml-sw600dp/rows_slavic.xml
@@ -26,41 +26,8 @@
     <Row
         latin:keyWidth="7.60%p"
     >
-        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
-        <Key
-            latin:keyLabel="&#x0439;" />
-        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
-        <Key
-            latin:keyLabel="&#x0446;" />
-        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
-        <Key
-            latin:keyLabel="&#x0443;"
-            latin:moreKeys="@string/more_keys_for_cyrillic_u" />
-        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
-        <Key
-            latin:keyLabel="&#x043A;" />
-        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
-        <Key
-            latin:keyLabel="&#x0435;"
-            latin:moreKeys="@string/more_keys_for_cyrillic_ye" />
-        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
-        <Key
-            latin:keyLabel="&#x043D;"
-            latin:moreKeys="@string/more_keys_for_cyrillic_en" />
-        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
-        <Key
-            latin:keyLabel="&#x0433;" />
-        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
-        <Key
-            latin:keyLabel="&#x0448;" />
-        <Key
-            latin:keyLabel="@string/keylabel_for_cyrillic_shcha" />
-        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
-        <Key
-            latin:keyLabel="&#x0437;" />
-        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
-        <Key
-            latin:keyLabel="&#x0445;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_slavic1" />
         <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
             latin:keyLabel="&#x044A;" />
@@ -72,41 +39,9 @@
     <Row
         latin:keyWidth="7.60%p"
     >
-        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
-        <Key
-            latin:keyLabel="&#x0444;"
+        <include
+            latin:keyboardLayout="@xml/rowkeys_slavic2"
             latin:keyXPos="2.25%p" />
-        <Key
-            latin:keyLabel="@string/keylabel_for_cyrillic_yery"
-            latin:moreKeys="@string/more_keys_for_cyrillic_yery" />
-        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
-        <Key
-            latin:keyLabel="&#x0432;" />
-        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
-        <Key
-            latin:keyLabel="&#x0430;" />
-        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
-        <Key
-            latin:keyLabel="&#x043F;" />
-        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
-        <Key
-            latin:keyLabel="&#x0440;" />
-        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
-        <Key
-            latin:keyLabel="&#x043E;"
-            latin:moreKeys="@string/more_keys_for_cyrillic_o" />
-        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
-        <Key
-            latin:keyLabel="&#x043B;" />
-        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
-        <Key
-            latin:keyLabel="&#x0434;" />
-        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
-        <Key
-            latin:keyLabel="&#x0436;" />
-        <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
-        <Key
-            latin:keyLabel="&#x044D;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-14.6%p"
@@ -117,32 +52,8 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle" />
-        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
-        <Key
-            latin:keyLabel="&#x044F;" />
-        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
-        <Key
-            latin:keyLabel="&#x0447;" />
-        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
-        <Key
-            latin:keyLabel="&#x0441;" />
-        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
-        <Key
-            latin:keyLabel="&#x043C;" />
-        <Key
-            latin:keyLabel="@string/keylabel_for_cyrillic_i" />
-        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
-        <Key
-            latin:keyLabel="&#x0442;" />
-        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
-        <Key
-            latin:keyLabel="&#x044C;" />
-        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
-        <Key
-            latin:keyLabel="&#x0431;" />
-        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
-        <Key
-            latin:keyLabel="&#x044E;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_slavic3" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <include
diff --git a/java/res/xml-sw768dp/rows_slavic.xml b/java/res/xml-sw768dp/rows_slavic.xml
index 3611ef6b3..f5092c69c 100644
--- a/java/res/xml-sw768dp/rows_slavic.xml
+++ b/java/res/xml-sw768dp/rows_slavic.xml
@@ -29,41 +29,8 @@
         <Key
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft" />
-        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
-        <Key
-            latin:keyLabel="&#x0439;" />
-        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
-        <Key
-            latin:keyLabel="&#x0446;" />
-        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
-        <Key
-            latin:keyLabel="&#x0443;"
-            latin:moreKeys="@string/more_keys_for_cyrillic_u" />
-        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
-        <Key
-            latin:keyLabel="&#x043A;" />
-        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
-        <Key
-            latin:keyLabel="&#x0435;"
-            latin:moreKeys="@string/more_keys_for_cyrillic_ye" />
-        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
-        <Key
-            latin:keyLabel="&#x043D;"
-            latin:moreKeys="@string/more_keys_for_cyrillic_en" />
-        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
-        <Key
-            latin:keyLabel="&#x0433;" />
-        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
-        <Key
-            latin:keyLabel="&#x0448;" />
-        <Key
-            latin:keyLabel="@string/keylabel_for_cyrillic_shcha" />
-        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
-        <Key
-            latin:keyLabel="&#x0437;" />
-        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
-        <Key
-            latin:keyLabel="&#x0445;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_slavic1" />
         <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
             latin:keyLabel="&#x044A;" />
@@ -78,40 +45,8 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="9.375%p" />
-        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
-        <Key
-            latin:keyLabel="&#x0444;" />
-        <Key
-            latin:keyLabel="@string/keylabel_for_cyrillic_yery"
-            latin:moreKeys="@string/more_keys_for_cyrillic_yery" />
-        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
-        <Key
-            latin:keyLabel="&#x0432;" />
-        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
-        <Key
-            latin:keyLabel="&#x0430;" />
-        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
-        <Key
-            latin:keyLabel="&#x043F;" />
-        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
-        <Key
-            latin:keyLabel="&#x0440;" />
-        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
-        <Key
-            latin:keyLabel="&#x043E;"
-            latin:moreKeys="@string/more_keys_for_cyrillic_o" />
-        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
-        <Key
-            latin:keyLabel="&#x043B;" />
-        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
-        <Key
-            latin:keyLabel="&#x0434;" />
-        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
-        <Key
-            latin:keyLabel="&#x0436;" />
-        <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
-        <Key
-            latin:keyLabel="&#x044D;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_slavic2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyXPos="-9.375%p"
@@ -123,32 +58,8 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="12.750%p" />
-        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
-        <Key
-            latin:keyLabel="&#x044F;" />
-        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
-        <Key
-            latin:keyLabel="&#x0447;" />
-        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
-        <Key
-            latin:keyLabel="&#x0441;" />
-        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
-        <Key
-            latin:keyLabel="&#x043C;" />
-        <Key
-            latin:keyLabel="@string/keylabel_for_cyrillic_i" />
-        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
-        <Key
-            latin:keyLabel="&#x0442;" />
-        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
-        <Key
-            latin:keyLabel="&#x044C;" />
-        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
-        <Key
-            latin:keyLabel="&#x0431;" />
-        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
-        <Key
-            latin:keyLabel="&#x044E;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_slavic3" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
diff --git a/java/res/xml/rowkeys_slavic1.xml b/java/res/xml/rowkeys_slavic1.xml
new file mode 100644
index 000000000..ab83d99ce
--- /dev/null
+++ b/java/res/xml/rowkeys_slavic1.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+    <Key
+        latin:keyLabel="&#x0439;"
+        latin:keyHintLabel="1"
+        latin:additionalMoreKeys="1" />
+    <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
+    <Key
+        latin:keyLabel="&#x0446;"
+        latin:keyHintLabel="2"
+        latin:additionalMoreKeys="2" />
+    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
+    <Key
+        latin:keyLabel="&#x0443;"
+        latin:keyHintLabel="3"
+        latin:additionalMoreKeys="3"
+        latin:moreKeys="@string/more_keys_for_cyrillic_u" />
+    <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
+    <Key
+        latin:keyLabel="&#x043A;"
+        latin:keyHintLabel="4"
+        latin:additionalMoreKeys="4" />
+    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
+    <Key
+        latin:keyLabel="&#x0435;"
+        latin:keyHintLabel="5"
+        latin:additionalMoreKeys="5"
+        latin:moreKeys="@string/more_keys_for_cyrillic_ye" />
+    <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
+    <Key
+        latin:keyLabel="&#x043D;"
+        latin:keyHintLabel="6"
+        latin:additionalMoreKeys="6"
+        latin:moreKeys="@string/more_keys_for_cyrillic_en" />
+    <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
+    <Key
+        latin:keyLabel="&#x0433;"
+        latin:keyHintLabel="7"
+        latin:additionalMoreKeys="7" />
+    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
+    <Key
+        latin:keyLabel="&#x0448;"
+        latin:keyHintLabel="8"
+        latin:additionalMoreKeys="8" />
+    <Key
+        latin:keyLabel="@string/keylabel_for_cyrillic_shcha"
+        latin:keyHintLabel="9"
+        latin:additionalMoreKeys="9" />
+    <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
+    <Key
+        latin:keyLabel="&#x0437;"
+        latin:keyHintLabel="0"
+        latin:additionalMoreKeys="0" />
+    <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
+    <Key
+        latin:keyLabel="&#x0445;"
+        latin:moreKeys="@string/more_keys_for_cyrillic_ha" />
+</merge>
diff --git a/java/res/xml/rowkeys_slavic2.xml b/java/res/xml/rowkeys_slavic2.xml
new file mode 100644
index 000000000..20415bc80
--- /dev/null
+++ b/java/res/xml/rowkeys_slavic2.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
+    <Key
+        latin:keyLabel="&#x0444;" />
+    <Key
+        latin:keyLabel="@string/keylabel_for_cyrillic_yery"
+        latin:moreKeys="@string/more_keys_for_cyrillic_yery" />
+    <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
+    <Key
+        latin:keyLabel="&#x0432;" />
+    <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
+    <Key
+        latin:keyLabel="&#x0430;" />
+    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
+    <Key
+        latin:keyLabel="&#x043F;" />
+    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
+    <Key
+        latin:keyLabel="&#x0440;" />
+    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
+    <Key
+        latin:keyLabel="&#x043E;"
+        latin:moreKeys="@string/more_keys_for_cyrillic_o" />
+    <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
+    <Key
+        latin:keyLabel="&#x043B;" />
+    <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
+    <Key
+        latin:keyLabel="&#x0434;" />
+    <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+    <Key
+        latin:keyLabel="&#x0436;" />
+    <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
+    <Key
+        latin:keyLabel="&#x044D;" />
+</merge>
diff --git a/java/res/xml/rowkeys_slavic3.xml b/java/res/xml/rowkeys_slavic3.xml
new file mode 100644
index 000000000..bb6722356
--- /dev/null
+++ b/java/res/xml/rowkeys_slavic3.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
+    <Key
+        latin:keyLabel="&#x044F;" />
+    <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
+    <Key
+        latin:keyLabel="&#x0447;" />
+    <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
+    <Key
+        latin:keyLabel="&#x0441;" />
+    <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
+    <Key
+        latin:keyLabel="&#x043C;" />
+    <Key
+        latin:keyLabel="@string/keylabel_for_cyrillic_i" />
+    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
+    <Key
+        latin:keyLabel="&#x0442;" />
+    <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+    <Key
+        latin:keyLabel="&#x044C;"
+        latin:moreKeys="@string/more_keys_for_cyrillic_soft_sign" />
+    <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
+    <Key
+        latin:keyLabel="&#x0431;" />
+    <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
+    <Key
+        latin:keyLabel="&#x044E;" />
+</merge>
diff --git a/java/res/xml/rows_slavic.xml b/java/res/xml/rows_slavic.xml
index d75f2091a..25dae92fc 100644
--- a/java/res/xml/rows_slavic.xml
+++ b/java/res/xml/rows_slavic.xml
@@ -26,102 +26,14 @@
     <Row
         latin:keyWidth="9.091%p"
     >
-        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
-        <Key
-            latin:keyLabel="&#x0439;"
-            latin:keyHintLabel="1"
-            latin:additionalMoreKeys="1" />
-        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
-        <Key
-            latin:keyLabel="&#x0446;"
-            latin:keyHintLabel="2"
-            latin:additionalMoreKeys="2" />
-        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
-        <Key
-            latin:keyLabel="&#x0443;"
-            latin:keyHintLabel="3"
-            latin:additionalMoreKeys="3"
-            latin:moreKeys="@string/more_keys_for_cyrillic_u" />
-        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
-        <Key
-            latin:keyLabel="&#x043A;"
-            latin:keyHintLabel="4"
-            latin:additionalMoreKeys="4" />
-        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
-        <Key
-            latin:keyLabel="&#x0435;"
-            latin:keyHintLabel="5"
-            latin:additionalMoreKeys="5"
-            latin:moreKeys="@string/more_keys_for_cyrillic_ye" />
-        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
-        <Key
-            latin:keyLabel="&#x043D;"
-            latin:keyHintLabel="6"
-            latin:additionalMoreKeys="6"
-            latin:moreKeys="@string/more_keys_for_cyrillic_en" />
-        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
-        <Key
-            latin:keyLabel="&#x0433;"
-            latin:keyHintLabel="7"
-            latin:additionalMoreKeys="7" />
-        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
-        <Key
-            latin:keyLabel="&#x0448;"
-            latin:keyHintLabel="8"
-            latin:additionalMoreKeys="8" />
-        <Key
-            latin:keyLabel="@string/keylabel_for_cyrillic_shcha"
-            latin:keyHintLabel="9"
-            latin:additionalMoreKeys="9" />
-        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
-        <Key
-            latin:keyLabel="&#x0437;"
-            latin:keyHintLabel="0"
-            latin:additionalMoreKeys="0" />
-        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
-        <Key
-            latin:keyLabel="&#x0445;"
-            latin:moreKeys="@string/more_keys_for_cyrillic_ha"
-            latin:keyWidth="fillRight" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_slavic1" />
     </Row>
     <Row
             latin:keyWidth="9.091%p"
     >
-        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
-        <Key
-            latin:keyLabel="&#x0444;" />
-        <Key
-            latin:keyLabel="@string/keylabel_for_cyrillic_yery"
-            latin:moreKeys="@string/more_keys_for_cyrillic_yery" />
-        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
-        <Key
-            latin:keyLabel="&#x0432;" />
-        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
-        <Key
-            latin:keyLabel="&#x0430;" />
-        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
-        <Key
-            latin:keyLabel="&#x043F;" />
-        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
-        <Key
-            latin:keyLabel="&#x0440;" />
-        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
-        <Key
-            latin:keyLabel="&#x043E;"
-            latin:moreKeys="@string/more_keys_for_cyrillic_o" />
-        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
-        <Key
-            latin:keyLabel="&#x043B;" />
-        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
-        <Key
-            latin:keyLabel="&#x0434;" />
-        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
-        <Key
-            latin:keyLabel="&#x0436;" />
-        <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
-        <Key
-            latin:keyLabel="&#x044D;"
-            latin:keyWidth="fillRight" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_slavic2" />
     </Row>
     <Row
         latin:keyWidth="8.5%p"
@@ -129,33 +41,8 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="11.75%p" />
-        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
-        <Key
-            latin:keyLabel="&#x044F;" />
-        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
-        <Key
-            latin:keyLabel="&#x0447;" />
-        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
-        <Key
-            latin:keyLabel="&#x0441;" />
-        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
-        <Key
-            latin:keyLabel="&#x043C;" />
-        <Key
-            latin:keyLabel="@string/keylabel_for_cyrillic_i" />
-        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
-        <Key
-            latin:keyLabel="&#x0442;" />
-        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
-        <Key
-            latin:keyLabel="&#x044C;"
-            latin:moreKeys="@string/more_keys_for_cyrillic_soft_sign" />
-        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
-        <Key
-            latin:keyLabel="&#x0431;" />
-        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
-        <Key
-            latin:keyLabel="&#x044E;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_slavic3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />