Rename keyboard XML files
* Slavic to East Slavic
* Serbian to South Slavic
* Scandinavian to Nordic
Bug: 6150183
Change-Id: I8f5641aa07b83cbb225f5fd73e351a6f8abe0784
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 7758074..5720a9a 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -388,6 +388,7 @@
<attr name="parentStyle" format="string" />
</declare-styleable>
+ <!-- TODO: Should be removed. This is no longer required if InputMethodSubtype is supported. -->
<declare-styleable name="KeyboardSet">
<!-- Locale of the keyboard layouts -->
<attr name="keyboardLocale" format="string" />
diff --git a/java/res/xml-be/keyboard_set.xml b/java/res/xml-be/keyboard_set.xml
index 042264a..8232346 100644
--- a/java/res/xml-be/keyboard_set.xml
+++ b/java/res/xml-be/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="be">
<Element
latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_slavic" />
+ latin:elementKeyboard="@xml/kbd_east_slavic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml-da/keyboard_set.xml b/java/res/xml-da/keyboard_set.xml
index cf01ae6..9b512ec 100644
--- a/java/res/xml-da/keyboard_set.xml
+++ b/java/res/xml-da/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="da">
<Element
latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_scandinavian" />
+ latin:elementKeyboard="@xml/kbd_nordic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml-et/keyboard_set.xml b/java/res/xml-et/keyboard_set.xml
index 1c23db3..9ccef8c 100644
--- a/java/res/xml-et/keyboard_set.xml
+++ b/java/res/xml-et/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="et">
<Element
latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_scandinavian" />
+ latin:elementKeyboard="@xml/kbd_nordic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml-fi/keyboard_set.xml b/java/res/xml-fi/keyboard_set.xml
index e8e4e7d..45968af 100644
--- a/java/res/xml-fi/keyboard_set.xml
+++ b/java/res/xml-fi/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="fi">
<Element
latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_scandinavian" />
+ latin:elementKeyboard="@xml/kbd_nordic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml-ky/keyboard_set.xml b/java/res/xml-ky/keyboard_set.xml
index abd5f16..71215c5 100644
--- a/java/res/xml-ky/keyboard_set.xml
+++ b/java/res/xml-ky/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="ky">
<Element
latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_slavic" />
+ latin:elementKeyboard="@xml/kbd_east_slavic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml-mk/keyboard_set.xml b/java/res/xml-mk/keyboard_set.xml
index 31199cb..5eabe8c 100644
--- a/java/res/xml-mk/keyboard_set.xml
+++ b/java/res/xml-mk/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="mk">
<Element
latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_serbian" />
+ latin:elementKeyboard="@xml/kbd_south_slavic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml-nb/keyboard_set.xml b/java/res/xml-nb/keyboard_set.xml
index d146beb..2d585a9 100644
--- a/java/res/xml-nb/keyboard_set.xml
+++ b/java/res/xml-nb/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="nb">
<Element
latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_scandinavian" />
+ latin:elementKeyboard="@xml/kbd_nordic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml-ru/keyboard_set.xml b/java/res/xml-ru/keyboard_set.xml
index b6a3568..76daf32 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_slavic" />
+ latin:elementKeyboard="@xml/kbd_east_slavic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml-sr/keyboard_set.xml b/java/res/xml-sr/keyboard_set.xml
index 15471db..71dedf4 100644
--- a/java/res/xml-sr/keyboard_set.xml
+++ b/java/res/xml-sr/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="sr">
<Element
latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_serbian" />
+ latin:elementKeyboard="@xml/kbd_south_slavic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml-sv/keyboard_set.xml b/java/res/xml-sv/keyboard_set.xml
index e5184d3..7135fc5 100644
--- a/java/res/xml-sv/keyboard_set.xml
+++ b/java/res/xml-sv/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="sv">
<Element
latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_scandinavian" />
+ latin:elementKeyboard="@xml/kbd_nordic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml-sw600dp/rowkeys_slavic1.xml b/java/res/xml-sw600dp/rowkeys_east_slavic1.xml
similarity index 100%
rename from java/res/xml-sw600dp/rowkeys_slavic1.xml
rename to java/res/xml-sw600dp/rowkeys_east_slavic1.xml
diff --git a/java/res/xml-sw600dp/rowkeys_serbian1.xml b/java/res/xml-sw600dp/rowkeys_south_slavic1.xml
similarity index 100%
rename from java/res/xml-sw600dp/rowkeys_serbian1.xml
rename to java/res/xml-sw600dp/rowkeys_south_slavic1.xml
diff --git a/java/res/xml-sw600dp/rows_slavic.xml b/java/res/xml-sw600dp/rows_east_slavic.xml
similarity index 90%
rename from java/res/xml-sw600dp/rows_slavic.xml
rename to java/res/xml-sw600dp/rows_east_slavic.xml
index 9a9ff74..71f0499 100644
--- a/java/res/xml-sw600dp/rows_slavic.xml
+++ b/java/res/xml-sw600dp/rows_east_slavic.xml
@@ -27,7 +27,7 @@
latin:keyWidth="7.60%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_slavic1" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<Key
latin:keyLabel="ъ" />
@@ -40,7 +40,7 @@
latin:keyWidth="7.60%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_slavic2"
+ latin:keyboardLayout="@xml/rowkeys_east_slavic2"
latin:keyXPos="2.25%p" />
<Key
latin:keyStyle="enterKeyStyle"
@@ -53,7 +53,7 @@
<Key
latin:keyStyle="shiftKeyStyle" />
<include
- latin:keyboardLayout="@xml/rowkeys_slavic3" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
diff --git a/java/res/xml-sw600dp/rows_scandinavian.xml b/java/res/xml-sw600dp/rows_nordic.xml
similarity index 93%
rename from java/res/xml-sw600dp/rows_scandinavian.xml
rename to java/res/xml-sw600dp/rows_nordic.xml
index df1e60f..5c74458 100644
--- a/java/res/xml-sw600dp/rows_scandinavian.xml
+++ b/java/res/xml-sw600dp/rows_nordic.xml
@@ -27,7 +27,7 @@
latin:keyWidth="7.9%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_scandinavian1" />
+ latin:keyboardLayout="@xml/rowkeys_nordic1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
@@ -37,7 +37,7 @@
latin:keyWidth="7.9%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_scandinavian2"
+ latin:keyboardLayout="@xml/rowkeys_nordic2"
latin:keyXPos="3.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
diff --git a/java/res/xml-sw600dp/rows_serbian.xml b/java/res/xml-sw600dp/rows_south_slavic.xml
similarity index 89%
rename from java/res/xml-sw600dp/rows_serbian.xml
rename to java/res/xml-sw600dp/rows_south_slavic.xml
index 62a87c2..9b79a36 100644
--- a/java/res/xml-sw600dp/rows_serbian.xml
+++ b/java/res/xml-sw600dp/rows_south_slavic.xml
@@ -27,7 +27,7 @@
latin:keyWidth="8.0%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_serbian1" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
@@ -37,7 +37,7 @@
latin:keyWidth="7.9%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_serbian2"
+ latin:keyboardLayout="@xml/rowkeys_south_slavic2"
latin:keyXPos="2.15%p" />
<Key
latin:keyStyle="enterKeyStyle"
@@ -51,7 +51,7 @@
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="8.0%p" />
<include
- latin:keyboardLayout="@xml/rowkeys_serbian3" />
+ latin:keyboardLayout="@xml/rowkeys_south_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_east_slavic.xml
similarity index 91%
rename from java/res/xml-sw768dp/rows_slavic.xml
rename to java/res/xml-sw768dp/rows_east_slavic.xml
index f5092c6..c041d0c 100644
--- a/java/res/xml-sw768dp/rows_slavic.xml
+++ b/java/res/xml-sw768dp/rows_east_slavic.xml
@@ -30,7 +30,7 @@
latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft" />
<include
- latin:keyboardLayout="@xml/rowkeys_slavic1" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<Key
latin:keyLabel="ъ" />
@@ -46,7 +46,7 @@
latin:keyLabelFlags="alignLeft"
latin:keyWidth="9.375%p" />
<include
- latin:keyboardLayout="@xml/rowkeys_slavic2" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-9.375%p"
@@ -59,7 +59,7 @@
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="12.750%p" />
<include
- latin:keyboardLayout="@xml/rowkeys_slavic3" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
diff --git a/java/res/xml-sw768dp/rows_scandinavian.xml b/java/res/xml-sw768dp/rows_nordic.xml
similarity index 93%
rename from java/res/xml-sw768dp/rows_scandinavian.xml
rename to java/res/xml-sw768dp/rows_nordic.xml
index f7e013b..d17449a 100644
--- a/java/res/xml-sw768dp/rows_scandinavian.xml
+++ b/java/res/xml-sw768dp/rows_nordic.xml
@@ -31,7 +31,7 @@
latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.500%p" />
<include
- latin:keyboardLayout="@xml/rowkeys_scandinavian1" />
+ latin:keyboardLayout="@xml/rowkeys_nordic1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.500%p"
@@ -45,7 +45,7 @@
latin:keyLabelFlags="alignLeft"
latin:keyWidth="9.375%p" />
<include
- latin:keyboardLayout="@xml/rowkeys_scandinavian2" />
+ latin:keyboardLayout="@xml/rowkeys_nordic2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-9.375%p"
diff --git a/java/res/xml-sw768dp/rows_serbian.xml b/java/res/xml-sw768dp/rows_south_slavic.xml
similarity index 90%
rename from java/res/xml-sw768dp/rows_serbian.xml
rename to java/res/xml-sw768dp/rows_south_slavic.xml
index fe3da2f..8a74e3f 100644
--- a/java/res/xml-sw768dp/rows_serbian.xml
+++ b/java/res/xml-sw768dp/rows_south_slavic.xml
@@ -30,7 +30,7 @@
latin:keyStyle="tabKeyStyle"
latin:keyLabelFlags="alignLeft" />
<include
- latin:keyboardLayout="@xml/rowkeys_serbian1" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-9.219%p"
@@ -44,7 +44,7 @@
latin:keyLabelFlags="alignLeft"
latin:keyWidth="11.172%p" />
<include
- latin:keyboardLayout="@xml/rowkeys_serbian2" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-15.704%p"
@@ -57,7 +57,7 @@
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="13.829%p" />
<include
- latin:keyboardLayout="@xml/rowkeys_serbian3" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
</Row>
diff --git a/java/res/xml-uk/keyboard_set.xml b/java/res/xml-uk/keyboard_set.xml
index 8eb9ecc..a7cfad1 100644
--- a/java/res/xml-uk/keyboard_set.xml
+++ b/java/res/xml-uk/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="uk">
<Element
latin:elementName="alphabet"
- latin:elementKeyboard="@xml/kbd_slavic" />
+ latin:elementKeyboard="@xml/kbd_east_slavic" />
<Element
latin:elementName="symbols"
latin:elementKeyboard="@xml/kbd_symbols" />
diff --git a/java/res/xml/kbd_slavic.xml b/java/res/xml/kbd_east_slavic.xml
similarity index 93%
copy from java/res/xml/kbd_slavic.xml
copy to java/res/xml/kbd_east_slavic.xml
index ca891c0..3bc2339 100644
--- a/java/res/xml/kbd_slavic.xml
+++ b/java/res/xml/kbd_east_slavic.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/rows_slavic" />
+ latin:keyboardLayout="@xml/rows_east_slavic" />
</Keyboard>
diff --git a/java/res/xml/kbd_slavic.xml b/java/res/xml/kbd_nordic.xml
similarity index 93%
rename from java/res/xml/kbd_slavic.xml
rename to java/res/xml/kbd_nordic.xml
index ca891c0..a2196c9 100644
--- a/java/res/xml/kbd_slavic.xml
+++ b/java/res/xml/kbd_nordic.xml
@@ -4,7 +4,7 @@
**
** Copyright 2011, The Android Open Source Project
**
-** Licensed under the Apache License, Version 2.0 (the "License"):
+** 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
**
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/rows_slavic" />
+ latin:keyboardLayout="@xml/rows_nordic" />
</Keyboard>
diff --git a/java/res/xml/kbd_serbian.xml b/java/res/xml/kbd_serbian.xml
deleted file mode 100644
index 05597c4..0000000
--- a/java/res/xml/kbd_serbian.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/rows_serbian" />
-</Keyboard>
diff --git a/java/res/xml/kbd_scandinavian.xml b/java/res/xml/kbd_south_slavic.xml
similarity index 92%
rename from java/res/xml/kbd_scandinavian.xml
rename to java/res/xml/kbd_south_slavic.xml
index 46ddfcb..f3ad02c 100644
--- a/java/res/xml/kbd_scandinavian.xml
+++ b/java/res/xml/kbd_south_slavic.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/rows_scandinavian" />
+ latin:keyboardLayout="@xml/rows_south_slavic" />
</Keyboard>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 8b1a3ef..f330b26 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -20,9 +20,46 @@
<!-- The attributes in this XML file provide configuration information -->
<!-- for the Input Method Manager. -->
-<!-- Keyboard: en_US, en_GB, ar, be, bg, cs, da, de, de(QWERTY), el, es, es_US, et, fi, fr, fr_CA,
- fr_CH, hr, hu, it, iw, ka, ky, lt, lv, mk, nb, nl, pl, pt, ro, ru, sk, sl, sr, sv, tr, uk,
- vi -->
+<!-- Supported locales: name/layout
+ ar: Arabic/arabic
+ be: Belarusian/east_slavic
+ bg: Bulgarian/bulgarian
+ cs: Czech/qwertz
+ da: Danish/nordic
+ de: German/qwertz
+ de_ZZ: German (QWERTY)/qwerty
+ el: Greek/greek
+ en_US: English United States/qwerty
+ en_GB: English Great Britain/qwerty
+ es: Spanish/spanish
+ et: Estonian/nordic
+ fi: Finnish/nordic
+ fr: French/azerty
+ fr_CA: French Canada/qwerty
+ fr_CH: French Switzerland/qwertz
+ hr: Croatian/qwertz
+ hu: Hungarian/qwertz
+ it: Italian/qwerty
+ iw: Hebrew/hebrew
+ ka: Georgian/georgian
+ ky: Kyrgyz/east_slavic
+ lt: Lithuanian/qwerty
+ lv: Latvian/qwerty
+ mk: Macedonian/south_slavic
+ nb: Norwaian Bokmål/nordic
+ nl: Dutch/qwerty
+ pl: Polish/qwerty
+ pt: Portuguese/qwerty
+ ro: Romanian/qwerty
+ ru: Russian/east_slavic
+ sk: Slovak/qwerty
+ sl: Slovenian/qwerty
+ sr: Serbian/south_slavic
+ sv: Swedish/nordic
+ tr: Turkish/qwerty
+ uk: Ukrainian/east_slavic
+ vi: Vietnamese/qwerty
+ -->
<!-- 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.-->
diff --git a/java/res/xml/rowkeys_slavic1.xml b/java/res/xml/rowkeys_east_slavic1.xml
similarity index 100%
rename from java/res/xml/rowkeys_slavic1.xml
rename to java/res/xml/rowkeys_east_slavic1.xml
diff --git a/java/res/xml/rowkeys_slavic2.xml b/java/res/xml/rowkeys_east_slavic2.xml
similarity index 100%
rename from java/res/xml/rowkeys_slavic2.xml
rename to java/res/xml/rowkeys_east_slavic2.xml
diff --git a/java/res/xml/rowkeys_slavic3.xml b/java/res/xml/rowkeys_east_slavic3.xml
similarity index 100%
rename from java/res/xml/rowkeys_slavic3.xml
rename to java/res/xml/rowkeys_east_slavic3.xml
diff --git a/java/res/xml/rowkeys_scandinavian1.xml b/java/res/xml/rowkeys_nordic1.xml
similarity index 100%
rename from java/res/xml/rowkeys_scandinavian1.xml
rename to java/res/xml/rowkeys_nordic1.xml
diff --git a/java/res/xml/rowkeys_scandinavian2.xml b/java/res/xml/rowkeys_nordic2.xml
similarity index 100%
rename from java/res/xml/rowkeys_scandinavian2.xml
rename to java/res/xml/rowkeys_nordic2.xml
diff --git a/java/res/xml/rowkeys_serbian1.xml b/java/res/xml/rowkeys_south_slavic1.xml
similarity index 100%
rename from java/res/xml/rowkeys_serbian1.xml
rename to java/res/xml/rowkeys_south_slavic1.xml
diff --git a/java/res/xml/rowkeys_serbian2.xml b/java/res/xml/rowkeys_south_slavic2.xml
similarity index 100%
rename from java/res/xml/rowkeys_serbian2.xml
rename to java/res/xml/rowkeys_south_slavic2.xml
diff --git a/java/res/xml/rowkeys_serbian3.xml b/java/res/xml/rowkeys_south_slavic3.xml
similarity index 100%
rename from java/res/xml/rowkeys_serbian3.xml
rename to java/res/xml/rowkeys_south_slavic3.xml
diff --git a/java/res/xml/rows_slavic.xml b/java/res/xml/rows_east_slavic.xml
similarity index 87%
rename from java/res/xml/rows_slavic.xml
rename to java/res/xml/rows_east_slavic.xml
index 25dae92..0193612 100644
--- a/java/res/xml/rows_slavic.xml
+++ b/java/res/xml/rows_east_slavic.xml
@@ -27,13 +27,13 @@
latin:keyWidth="9.091%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_slavic1" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
</Row>
<Row
latin:keyWidth="9.091%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_slavic2" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
</Row>
<Row
latin:keyWidth="8.5%p"
@@ -42,7 +42,7 @@
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="11.75%p" />
<include
- latin:keyboardLayout="@xml/rowkeys_slavic3" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_scandinavian.xml b/java/res/xml/rows_nordic.xml
similarity index 91%
rename from java/res/xml/rows_scandinavian.xml
rename to java/res/xml/rows_nordic.xml
index 45642f4..51d20e8 100644
--- a/java/res/xml/rows_scandinavian.xml
+++ b/java/res/xml/rows_nordic.xml
@@ -27,13 +27,13 @@
latin:keyWidth="9.091%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_scandinavian1" />
+ latin:keyboardLayout="@xml/rowkeys_nordic1" />
</Row>
<Row
latin:keyWidth="9.091%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_scandinavian2" />
+ latin:keyboardLayout="@xml/rowkeys_nordic2" />
</Row>
<Row
latin:keyWidth="10%p"
diff --git a/java/res/xml/rows_serbian.xml b/java/res/xml/rows_south_slavic.xml
similarity index 86%
rename from java/res/xml/rows_serbian.xml
rename to java/res/xml/rows_south_slavic.xml
index f3f4084..31bb389 100644
--- a/java/res/xml/rows_serbian.xml
+++ b/java/res/xml/rows_south_slavic.xml
@@ -27,13 +27,13 @@
latin:keyWidth="9.091%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_serbian1" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
</Row>
<Row
latin:keyWidth="9.091%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_serbian2" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
</Row>
<Row
latin:keyWidth="8.5%p"
@@ -42,7 +42,7 @@
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="11.75%p" />
<include
- latin:keyboardLayout="@xml/rowkeys_serbian3" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />