diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 775807420..5720a9a6a 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -388,6 +388,7 @@
+
diff --git a/java/res/xml-be/keyboard_set.xml b/java/res/xml-be/keyboard_set.xml
index 042264aae..823234698 100644
--- a/java/res/xml-be/keyboard_set.xml
+++ b/java/res/xml-be/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="be">
+ latin:elementKeyboard="@xml/kbd_east_slavic" />
diff --git a/java/res/xml-da/keyboard_set.xml b/java/res/xml-da/keyboard_set.xml
index cf01ae6f5..9b512ec6c 100644
--- a/java/res/xml-da/keyboard_set.xml
+++ b/java/res/xml-da/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="da">
+ latin:elementKeyboard="@xml/kbd_nordic" />
diff --git a/java/res/xml-et/keyboard_set.xml b/java/res/xml-et/keyboard_set.xml
index 1c23db3d8..9ccef8c81 100644
--- a/java/res/xml-et/keyboard_set.xml
+++ b/java/res/xml-et/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="et">
+ latin:elementKeyboard="@xml/kbd_nordic" />
diff --git a/java/res/xml-fi/keyboard_set.xml b/java/res/xml-fi/keyboard_set.xml
index e8e4e7d9a..45968af90 100644
--- a/java/res/xml-fi/keyboard_set.xml
+++ b/java/res/xml-fi/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="fi">
+ latin:elementKeyboard="@xml/kbd_nordic" />
diff --git a/java/res/xml-ky/keyboard_set.xml b/java/res/xml-ky/keyboard_set.xml
index abd5f1631..71215c5e4 100644
--- a/java/res/xml-ky/keyboard_set.xml
+++ b/java/res/xml-ky/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="ky">
+ latin:elementKeyboard="@xml/kbd_east_slavic" />
diff --git a/java/res/xml-mk/keyboard_set.xml b/java/res/xml-mk/keyboard_set.xml
index 31199cb0a..5eabe8c6b 100644
--- a/java/res/xml-mk/keyboard_set.xml
+++ b/java/res/xml-mk/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="mk">
+ latin:elementKeyboard="@xml/kbd_south_slavic" />
diff --git a/java/res/xml-nb/keyboard_set.xml b/java/res/xml-nb/keyboard_set.xml
index d146beb71..2d585a908 100644
--- a/java/res/xml-nb/keyboard_set.xml
+++ b/java/res/xml-nb/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="nb">
+ latin:elementKeyboard="@xml/kbd_nordic" />
diff --git a/java/res/xml-ru/keyboard_set.xml b/java/res/xml-ru/keyboard_set.xml
index b6a356891..76daf32a7 100644
--- a/java/res/xml-ru/keyboard_set.xml
+++ b/java/res/xml-ru/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="ru">
+ latin:elementKeyboard="@xml/kbd_east_slavic" />
diff --git a/java/res/xml-sr/keyboard_set.xml b/java/res/xml-sr/keyboard_set.xml
index 15471dbcd..71dedf497 100644
--- a/java/res/xml-sr/keyboard_set.xml
+++ b/java/res/xml-sr/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="sr">
+ latin:elementKeyboard="@xml/kbd_south_slavic" />
diff --git a/java/res/xml-sv/keyboard_set.xml b/java/res/xml-sv/keyboard_set.xml
index e5184d33f..7135fc54b 100644
--- a/java/res/xml-sv/keyboard_set.xml
+++ b/java/res/xml-sv/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="sv">
+ latin:elementKeyboard="@xml/kbd_nordic" />
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 9a9ff74fa..71f049923 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"
>
+ latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
@@ -40,7 +40,7 @@
latin:keyWidth="7.60%p"
>
+ latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
+ latin:keyboardLayout="@xml/rowkeys_nordic1" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
@@ -46,7 +46,7 @@
latin:keyLabelFlags="alignLeft"
latin:keyWidth="9.375%p" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
+ latin:keyboardLayout="@xml/rowkeys_nordic1" />
+ latin:keyboardLayout="@xml/rowkeys_nordic2" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
diff --git a/java/res/xml-uk/keyboard_set.xml b/java/res/xml-uk/keyboard_set.xml
index 8eb9eccb7..a7cfad162 100644
--- a/java/res/xml-uk/keyboard_set.xml
+++ b/java/res/xml-uk/keyboard_set.xml
@@ -23,7 +23,7 @@
latin:keyboardLocale="uk">
+ latin:elementKeyboard="@xml/kbd_east_slavic" />
diff --git a/java/res/xml/kbd_slavic.xml b/java/res/xml/kbd_east_slavic.xml
similarity index 93%
rename from java/res/xml/kbd_slavic.xml
rename to java/res/xml/kbd_east_slavic.xml
index ca891c000..3bc233953 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"
>
+ latin:keyboardLayout="@xml/rows_east_slavic" />
diff --git a/java/res/xml/kbd_serbian.xml b/java/res/xml/kbd_nordic.xml
similarity index 93%
rename from java/res/xml/kbd_serbian.xml
rename to java/res/xml/kbd_nordic.xml
index 05597c4eb..a2196c926 100644
--- a/java/res/xml/kbd_serbian.xml
+++ b/java/res/xml/kbd_nordic.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
+ latin:keyboardLayout="@xml/rows_nordic" />
diff --git a/java/res/xml/kbd_scandinavian.xml b/java/res/xml/kbd_south_slavic.xml
similarity index 93%
rename from java/res/xml/kbd_scandinavian.xml
rename to java/res/xml/kbd_south_slavic.xml
index 46ddfcb8f..f3ad02c7b 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"
>
+ latin:keyboardLayout="@xml/rows_south_slavic" />
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 8b1a3ef77..f330b268e 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -20,9 +20,46 @@
-
+
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 25dae92fc..019361250 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"
>
+ latin:keyboardLayout="@xml/rowkeys_east_slavic1" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
+ latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
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 45642f4be..51d20e83f 100644
--- a/java/res/xml/rows_scandinavian.xml
+++ b/java/res/xml/rows_nordic.xml
@@ -27,13 +27,13 @@
latin:keyWidth="9.091%p"
>
+ latin:keyboardLayout="@xml/rowkeys_nordic1" />
+ latin:keyboardLayout="@xml/rowkeys_nordic2" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic1" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
+ latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSet.java b/java/src/com/android/inputmethod/keyboard/KeyboardSet.java
index 5ac6d03a8..680ff0d25 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSet.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSet.java
@@ -379,6 +379,8 @@ public class KeyboardSet {
}
}
+ // TODO: Should be removed. This is no longer required if {@link InputMethodSubtype} is
+ // supported.
public static String parseKeyboardLocale(Resources res, int resId)
throws XmlPullParserException, IOException {
final XmlPullParser parser = res.getXml(resId);