From 258bd90853603ff6f04570905779b2c305ed5d6a Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Fri, 9 Mar 2012 16:00:57 +0900
Subject: [PATCH] Breakdown Bulgarian keyboard into rows

Change-Id: Ie0da26a48b186be081ad61858116e519019d1973
---
 java/res/xml-sw600dp/rowkeys_bulgarian1.xml |  59 ++++++++++
 java/res/xml-sw600dp/rows_bulgarian.xml     |  98 +---------------
 java/res/xml-sw768dp/rows_bulgarian.xml     |  98 +---------------
 java/res/xml/rowkeys_bulgarian1.xml         |  79 +++++++++++++
 java/res/xml/rowkeys_bulgarian2.xml         |  57 ++++++++++
 java/res/xml/rowkeys_bulgarian3.xml         |  48 ++++++++
 java/res/xml/rows_bulgarian.xml             | 120 +-------------------
 7 files changed, 261 insertions(+), 298 deletions(-)
 create mode 100644 java/res/xml-sw600dp/rowkeys_bulgarian1.xml
 create mode 100644 java/res/xml/rowkeys_bulgarian1.xml
 create mode 100644 java/res/xml/rowkeys_bulgarian2.xml
 create mode 100644 java/res/xml/rowkeys_bulgarian3.xml

diff --git a/java/res/xml-sw600dp/rowkeys_bulgarian1.xml b/java/res/xml-sw600dp/rowkeys_bulgarian1.xml
new file mode 100644
index 000000000..3e1b2e5cc
--- /dev/null
+++ b/java/res/xml-sw600dp/rowkeys_bulgarian1.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+0447: "ч" CYRILLIC SMALL LETTER CHE -->
+    <Key
+        latin:keyLabel="&#x0447;" />
+    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
+    <Key
+        latin:keyLabel="&#x0448;" />
+    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
+    <Key
+        latin:keyLabel="&#x0435;" />
+    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
+    <Key
+        latin:keyLabel="&#x0440;" />
+    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
+    <Key
+        latin:keyLabel="&#x0442;" />
+    <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+    <Key
+        latin:keyLabel="&#x044A;" />
+    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
+    <Key
+        latin:keyLabel="&#x0443;" />
+    <!-- U+0438: "и" CYRILLIC SMALL LETTER I
+         U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
+    <Key
+        latin:keyLabel="&#x0438;"
+        latin:moreKeys="&#x045D;" />
+    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
+    <Key
+        latin:keyLabel="&#x043E;" />
+    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
+    <Key
+        latin:keyLabel="&#x043F;" />
+    <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
+    <Key
+        latin:keyLabel="&#x044F;" />
+</merge>
diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml
index 87a273cef..054b4500e 100644
--- a/java/res/xml-sw600dp/rows_bulgarian.xml
+++ b/java/res/xml-sw600dp/rows_bulgarian.xml
@@ -26,41 +26,8 @@
     <Row
         latin:keyWidth="7.692%p"
     >
-        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
-        <Key
-            latin:keyLabel="&#x0447;" />
-        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
-        <Key
-            latin:keyLabel="&#x0448;" />
-        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
-        <Key
-            latin:keyLabel="&#x0435;" />
-        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
-        <Key
-            latin:keyLabel="&#x0440;" />
-        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
-        <Key
-            latin:keyLabel="&#x0442;" />
-        <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
-        <Key
-            latin:keyLabel="&#x044A;" />
-        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
-        <Key
-            latin:keyLabel="&#x0443;" />
-        <!-- U+0438: "и" CYRILLIC SMALL LETTER I
-             U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
-        <Key
-            latin:keyLabel="&#x0438;"
-            latin:moreKeys="&#x045D;" />
-        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
-        <Key
-            latin:keyLabel="&#x043E;" />
-        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
-        <Key
-            latin:keyLabel="&#x043F;" />
-        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
-        <Key
-            latin:keyLabel="&#x044F;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bulgarian1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -68,40 +35,9 @@
     <Row
         latin:keyWidth="7.692%p"
     >
-        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
-        <Key
-            latin:keyLabel="&#x0430;"
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bulgarian2"
             latin:keyXPos="4.000%p" />
-        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
-        <Key
-            latin:keyLabel="&#x0441;" />
-        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
-        <Key
-            latin:keyLabel="&#x0434;" />
-        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
-        <Key
-            latin:keyLabel="&#x0444;" />
-        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
-        <Key
-            latin:keyLabel="&#x0433;" />
-        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
-        <Key
-            latin:keyLabel="&#x0445;" />
-        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
-        <Key
-            latin:keyLabel="&#x0439;" />
-        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
-        <Key
-            latin:keyLabel="&#x043A;" />
-        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
-        <Key
-            latin:keyLabel="&#x043B;" />
-        <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
-        <Key
-            latin:keyLabel="&#x0449;" />
-        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
-        <Key
-            latin:keyLabel="&#x044C;" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -112,30 +48,8 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="10.000%p" />
-        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
-        <Key
-            latin:keyLabel="&#x0437;" />
-        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
-        <Key
-            latin:keyLabel="&#x0436;" />
-        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
-        <Key
-            latin:keyLabel="&#x0446;" />
-        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
-        <Key
-            latin:keyLabel="&#x0432;" />
-        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
-        <Key
-            latin:keyLabel="&#x0431;" />
-        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
-        <Key
-            latin:keyLabel="&#x043D;" />
-        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
-        <Key
-            latin:keyLabel="&#x043C;" />
-        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
-        <Key
-            latin:keyLabel="&#x044E;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <include
diff --git a/java/res/xml-sw768dp/rows_bulgarian.xml b/java/res/xml-sw768dp/rows_bulgarian.xml
index 0204dae97..7fac3edbd 100644
--- a/java/res/xml-sw768dp/rows_bulgarian.xml
+++ b/java/res/xml-sw768dp/rows_bulgarian.xml
@@ -29,41 +29,8 @@
         <Key
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelFlags="alignLeft" />
-        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
-        <Key
-            latin:keyLabel="&#x0447;" />
-        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
-        <Key
-            latin:keyLabel="&#x0448;" />
-        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
-        <Key
-            latin:keyLabel="&#x0435;" />
-        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
-        <Key
-            latin:keyLabel="&#x0440;" />
-        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
-        <Key
-            latin:keyLabel="&#x0442;" />
-        <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
-        <Key
-            latin:keyLabel="&#x044A;" />
-        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
-        <Key
-            latin:keyLabel="&#x0443;" />
-        <!-- U+0438: "и" CYRILLIC SMALL LETTER I
-             U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
-        <Key
-            latin:keyLabel="&#x0438;"
-            latin:moreKeys="&#x045D;" />
-        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
-        <Key
-            latin:keyLabel="&#x043E;" />
-        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
-        <Key
-            latin:keyLabel="&#x043F;" />
-        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
-        <Key
-            latin:keyLabel="&#x044F;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bulgarian1" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -75,39 +42,8 @@
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="9.375%p" />
-        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
-        <Key
-            latin:keyLabel="&#x0430;" />
-        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
-        <Key
-            latin:keyLabel="&#x0441;" />
-        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
-        <Key
-            latin:keyLabel="&#x0434;" />
-        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
-        <Key
-            latin:keyLabel="&#x0444;" />
-        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
-        <Key
-            latin:keyLabel="&#x0433;" />
-        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
-        <Key
-            latin:keyLabel="&#x0445;" />
-        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
-        <Key
-            latin:keyLabel="&#x0439;" />
-        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
-        <Key
-            latin:keyLabel="&#x043A;" />
-        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
-        <Key
-            latin:keyLabel="&#x043B;" />
-        <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
-        <Key
-            latin:keyLabel="&#x0449;" />
-        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
-        <Key
-            latin:keyLabel="&#x044C;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bulgarian2" />
         <Key
             latin:keyStyle="enterKeyStyle"
             latin:keyWidth="fillBoth" />
@@ -118,30 +54,8 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="14.375%p" />
-        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
-        <Key
-            latin:keyLabel="&#x0437;" />
-        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
-        <Key
-            latin:keyLabel="&#x0436;" />
-        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
-        <Key
-            latin:keyLabel="&#x0446;" />
-        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
-        <Key
-            latin:keyLabel="&#x0432;" />
-        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
-        <Key
-            latin:keyLabel="&#x0431;" />
-        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
-        <Key
-            latin:keyLabel="&#x043D;" />
-        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
-        <Key
-            latin:keyLabel="&#x043C;" />
-        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
-        <Key
-            latin:keyLabel="&#x044E;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
         <include
             latin:keyboardLayout="@xml/keys_comma_period" />
         <Key
diff --git a/java/res/xml/rowkeys_bulgarian1.xml b/java/res/xml/rowkeys_bulgarian1.xml
new file mode 100644
index 000000000..adeecaf20
--- /dev/null
+++ b/java/res/xml/rowkeys_bulgarian1.xml
@@ -0,0 +1,79 @@
+<?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+0447: "ч" CYRILLIC SMALL LETTER CHE -->
+    <Key
+        latin:keyLabel="&#x0447;"
+        latin:keyHintLabel="1"
+        latin:additionalMoreKeys="1" />
+    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
+    <Key
+        latin:keyLabel="&#x0448;"
+        latin:keyHintLabel="2"
+        latin:additionalMoreKeys="2" />
+    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
+    <Key
+        latin:keyLabel="&#x0435;"
+        latin:keyHintLabel="3"
+        latin:additionalMoreKeys="3" />
+    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
+    <Key
+        latin:keyLabel="&#x0440;"
+        latin:keyHintLabel="4"
+        latin:additionalMoreKeys="4" />
+    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
+    <Key
+        latin:keyLabel="&#x0442;"
+        latin:keyHintLabel="5"
+        latin:additionalMoreKeys="5" />
+    <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+    <Key
+        latin:keyLabel="&#x044A;"
+        latin:keyHintLabel="6"
+        latin:additionalMoreKeys="6" />
+    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
+    <Key
+        latin:keyLabel="&#x0443;"
+        latin:keyHintLabel="7"
+        latin:additionalMoreKeys="7" />
+    <!-- U+0438: "и" CYRILLIC SMALL LETTER I
+         U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
+    <Key
+        latin:keyLabel="&#x0438;"
+        latin:keyHintLabel="8"
+        latin:additionalMoreKeys="8"
+        latin:moreKeys="&#x045D;" />
+    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
+    <Key
+        latin:keyLabel="&#x043E;"
+        latin:keyHintLabel="9"
+        latin:additionalMoreKeys="9" />
+    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
+    <Key
+        latin:keyLabel="&#x043F;"
+        latin:keyHintLabel="0"
+        latin:additionalMoreKeys="0" />
+    <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
+    <Key
+        latin:keyLabel="&#x044F;" />
+</merge>
diff --git a/java/res/xml/rowkeys_bulgarian2.xml b/java/res/xml/rowkeys_bulgarian2.xml
new file mode 100644
index 000000000..599edd3ed
--- /dev/null
+++ b/java/res/xml/rowkeys_bulgarian2.xml
@@ -0,0 +1,57 @@
+<?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+0430: "а" CYRILLIC SMALL LETTER A -->
+    <Key
+        latin:keyLabel="&#x0430;" />
+    <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
+    <Key
+        latin:keyLabel="&#x0441;" />
+    <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
+    <Key
+        latin:keyLabel="&#x0434;" />
+    <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
+    <Key
+        latin:keyLabel="&#x0444;" />
+    <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
+    <Key
+        latin:keyLabel="&#x0433;" />
+    <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
+    <Key
+        latin:keyLabel="&#x0445;" />
+    <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+    <Key
+        latin:keyLabel="&#x0439;" />
+    <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
+    <Key
+        latin:keyLabel="&#x043A;" />
+    <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
+    <Key
+        latin:keyLabel="&#x043B;" />
+    <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+    <Key
+        latin:keyLabel="&#x0449;" />
+    <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+    <Key
+        latin:keyLabel="&#x044C;" />
+</merge>
diff --git a/java/res/xml/rowkeys_bulgarian3.xml b/java/res/xml/rowkeys_bulgarian3.xml
new file mode 100644
index 000000000..19872cdfe
--- /dev/null
+++ b/java/res/xml/rowkeys_bulgarian3.xml
@@ -0,0 +1,48 @@
+<?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+0437: "з" CYRILLIC SMALL LETTER ZE -->
+    <Key
+        latin:keyLabel="&#x0437;" />
+    <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+    <Key
+        latin:keyLabel="&#x0436;" />
+    <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
+    <Key
+        latin:keyLabel="&#x0446;" />
+    <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
+    <Key
+        latin:keyLabel="&#x0432;" />
+    <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
+    <Key
+        latin:keyLabel="&#x0431;" />
+    <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
+    <Key
+        latin:keyLabel="&#x043D;" />
+    <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
+    <Key
+        latin:keyLabel="&#x043C;" />
+    <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
+    <Key
+        latin:keyLabel="&#x044E;" />
+</merge>
diff --git a/java/res/xml/rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml
index 3d954a900..883c2833d 100644
--- a/java/res/xml/rows_bulgarian.xml
+++ b/java/res/xml/rows_bulgarian.xml
@@ -26,100 +26,14 @@
     <Row
         latin:keyWidth="9.091%p"
     >
-        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
-        <Key
-            latin:keyLabel="&#x0447;"
-            latin:keyHintLabel="1"
-            latin:additionalMoreKeys="1" />
-        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
-        <Key
-            latin:keyLabel="&#x0448;"
-            latin:keyHintLabel="2"
-            latin:additionalMoreKeys="2" />
-        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
-        <Key
-            latin:keyLabel="&#x0435;"
-            latin:keyHintLabel="3"
-            latin:additionalMoreKeys="3" />
-        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
-        <Key
-            latin:keyLabel="&#x0440;"
-            latin:keyHintLabel="4"
-            latin:additionalMoreKeys="4" />
-        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
-        <Key
-            latin:keyLabel="&#x0442;"
-            latin:keyHintLabel="5"
-            latin:additionalMoreKeys="5" />
-        <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
-        <Key
-            latin:keyLabel="&#x044A;"
-            latin:keyHintLabel="6"
-            latin:additionalMoreKeys="6" />
-        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
-        <Key
-            latin:keyLabel="&#x0443;"
-            latin:keyHintLabel="7"
-            latin:additionalMoreKeys="7" />
-        <!-- U+0438: "и" CYRILLIC SMALL LETTER I
-             U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
-        <Key
-            latin:keyLabel="&#x0438;"
-            latin:keyHintLabel="8"
-            latin:additionalMoreKeys="8"
-            latin:moreKeys="&#x045D;" />
-        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
-        <Key
-            latin:keyLabel="&#x043E;"
-            latin:keyHintLabel="9"
-            latin:additionalMoreKeys="9" />
-        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
-        <Key
-            latin:keyLabel="&#x043F;"
-            latin:keyHintLabel="0"
-            latin:additionalMoreKeys="0" />
-        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
-        <Key
-            latin:keyLabel="&#x044F;"
-            latin:keyWidth="fillRight" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bulgarian1" />
     </Row>
     <Row
             latin:keyWidth="9.091%p"
     >
-        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
-        <Key
-            latin:keyLabel="&#x0430;" />
-        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
-        <Key
-            latin:keyLabel="&#x0441;" />
-        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
-        <Key
-            latin:keyLabel="&#x0434;" />
-        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
-        <Key
-            latin:keyLabel="&#x0444;" />
-        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
-        <Key
-            latin:keyLabel="&#x0433;" />
-        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
-        <Key
-            latin:keyLabel="&#x0445;" />
-        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
-        <Key
-            latin:keyLabel="&#x0439;" />
-        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
-        <Key
-            latin:keyLabel="&#x043A;" />
-        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
-        <Key
-            latin:keyLabel="&#x043B;" />
-        <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
-        <Key
-            latin:keyLabel="&#x0449;" />
-        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
-        <Key
-            latin:keyLabel="&#x044C;"
-            latin:keyWidth="fillRight" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bulgarian2" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
@@ -127,30 +41,8 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="13.636%p" />
-        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
-        <Key
-            latin:keyLabel="&#x0437;" />
-        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
-        <Key
-            latin:keyLabel="&#x0436;" />
-        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
-        <Key
-            latin:keyLabel="&#x0446;" />
-        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
-        <Key
-            latin:keyLabel="&#x0432;" />
-        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
-        <Key
-            latin:keyLabel="&#x0431;" />
-        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
-        <Key
-            latin:keyLabel="&#x043D;" />
-        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
-        <Key
-            latin:keyLabel="&#x043C;" />
-        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
-        <Key
-            latin:keyLabel="&#x044E;" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />