diff --git a/java/res/xml-ar/kbd_symbols.xml b/java/res/xml-ar/kbd_symbols.xml
index 9e5c255d0788ed33c4a7f62f0e293a1f4efe4538..c1905b87566ecf30d859839d377628cddb0c9159 100644
--- a/java/res/xml-ar/kbd_symbols.xml
+++ b/java/res/xml-ar/kbd_symbols.xml
@@ -23,5 +23,5 @@
latin:isRtlKeyboard="true"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_symbols" />
+ latin:keyboardLayout="@xml/rows_symbols" />
</Keyboard>
diff --git a/java/res/xml-ar/kbd_symbols_shift.xml b/java/res/xml-ar/kbd_symbols_shift.xml
index 934e6f849720a0c1b33e8f9d885a1905d985f74a..820b425ea469d3950a56a222cb133f012d0bfd24 100644
--- a/java/res/xml-ar/kbd_symbols_shift.xml
+++ b/java/res/xml-ar/kbd_symbols_shift.xml
@@ -23,5 +23,5 @@
latin:isRtlKeyboard="true"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_symbols_shift" />
+ latin:keyboardLayout="@xml/rows_symbols_shift" />
</Keyboard>
diff --git a/java/res/xml-iw/kbd_symbols.xml b/java/res/xml-iw/kbd_symbols.xml
index 9e5c255d0788ed33c4a7f62f0e293a1f4efe4538..c1905b87566ecf30d859839d377628cddb0c9159 100644
--- a/java/res/xml-iw/kbd_symbols.xml
+++ b/java/res/xml-iw/kbd_symbols.xml
@@ -23,5 +23,5 @@
latin:isRtlKeyboard="true"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_symbols" />
+ latin:keyboardLayout="@xml/rows_symbols" />
</Keyboard>
diff --git a/java/res/xml-iw/kbd_symbols_shift.xml b/java/res/xml-iw/kbd_symbols_shift.xml
index 934e6f849720a0c1b33e8f9d885a1905d985f74a..820b425ea469d3950a56a222cb133f012d0bfd24 100644
--- a/java/res/xml-iw/kbd_symbols_shift.xml
+++ b/java/res/xml-iw/kbd_symbols_shift.xml
@@ -23,5 +23,5 @@
latin:isRtlKeyboard="true"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_symbols_shift" />
+ latin:keyboardLayout="@xml/rows_symbols_shift" />
</Keyboard>
diff --git a/java/res/xml-land/kbd_number.xml b/java/res/xml-land/kbd_number.xml
index f5930ef41d6075b302a5fc2bd91a6e1f9bfc1267..7cc0fb2748edf46f568ef61496f71c6dd5c17e4d 100644
--- a/java/res/xml-land/kbd_number.xml
+++ b/java/res/xml-land/kbd_number.xml
@@ -24,5 +24,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_number" />
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml-land/kbd_phone.xml b/java/res/xml-land/kbd_phone.xml
index 3b1fb36ffdad61e73092a4f56d99170047595cd4..aa54b83909e2a8c16e72391b2834631d094d7905 100644
--- a/java/res/xml-land/kbd_phone.xml
+++ b/java/res/xml-land/kbd_phone.xml
@@ -24,5 +24,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-land/kbd_phone_shift.xml b/java/res/xml-land/kbd_phone_shift.xml
index e5966477697f6f453a343c9d597fec17d25734b8..f456a17759a2b5987978b671163725b3dd178b6b 100644
--- a/java/res/xml-land/kbd_phone_shift.xml
+++ b/java/res/xml-land/kbd_phone_shift.xml
@@ -24,5 +24,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
+ latin:keyboardLayout="@xml/rows_phone_shift" />
</Keyboard>
diff --git a/java/res/xml-sw600dp-land/kbd_number.xml b/java/res/xml-sw600dp-land/kbd_number.xml
index 7e3188b0f55c13e3cb176627416e588b9a17a965..9d358b678a7ceccfbb2a2cfb7282cd5d1b07473c 100644
--- a/java/res/xml-sw600dp-land/kbd_number.xml
+++ b/java/res/xml-sw600dp-land/kbd_number.xml
@@ -24,5 +24,5 @@
latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_number" />
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml-sw600dp-land/kbd_phone.xml b/java/res/xml-sw600dp-land/kbd_phone.xml
index 28df7efa33d4e14c1cfde9dba2adf7f168d375a9..abac6bd4fccea1ae6369fa258deb50cd5bdc3501 100644
--- a/java/res/xml-sw600dp-land/kbd_phone.xml
+++ b/java/res/xml-sw600dp-land/kbd_phone.xml
@@ -24,5 +24,5 @@
latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-sw600dp-land/kbd_phone_shift.xml b/java/res/xml-sw600dp-land/kbd_phone_shift.xml
index daf1d18c580d89fa050751d462d54e077f2d52f6..ba837922f85e55af5c48a3d0552e67f9d840fc0e 100644
--- a/java/res/xml-sw600dp-land/kbd_phone_shift.xml
+++ b/java/res/xml-sw600dp-land/kbd_phone_shift.xml
@@ -24,5 +24,5 @@
latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
+ latin:keyboardLayout="@xml/rows_phone_shift" />
</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index ad588d7ed842c170c358847ed730270809939fa8..70cf6a2ca7a618a1f2cc7fd3341cf77528e178ad 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -23,5 +23,5 @@
latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_number" />
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index ce769b8f720778ce957e48a8aa2edda977d615cd..72acef21c277d862c8969242ac74eb3d38c7f50e 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -23,5 +23,5 @@
latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_phone_shift.xml b/java/res/xml-sw600dp/kbd_phone_shift.xml
index 3753deb8cbed6f80fd077f3f5ece3d0da0f94edf..e722545761327b52c20040517484b74e9ced99fa 100644
--- a/java/res/xml-sw600dp/kbd_phone_shift.xml
+++ b/java/res/xml-sw600dp/kbd_phone_shift.xml
@@ -23,5 +23,5 @@
latin:keyWidth="15.00%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
+ latin:keyboardLayout="@xml/rows_phone_shift" />
</Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_f2.xml b/java/res/xml-sw600dp/key_f2.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_qwerty_f2.xml
rename to java/res/xml-sw600dp/key_f2.xml
diff --git a/java/res/xml-sw600dp/kbd_row3_smiley.xml b/java/res/xml-sw600dp/key_smiley.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_row3_smiley.xml
rename to java/res/xml-sw600dp/key_smiley.xml
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/key_styles_common.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_key_styles.xml
rename to java/res/xml-sw600dp/key_styles_common.xml
diff --git a/java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw600dp/keys_apostrophe_dash.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_row4_apostrophe_dash.xml
rename to java/res/xml-sw600dp/keys_apostrophe_dash.xml
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/row_qwerty1.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_qwerty_row1.xml
rename to java/res/xml-sw600dp/row_qwerty1.xml
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row2.xml b/java/res/xml-sw600dp/row_qwerty2.xml
similarity index 100%
rename from java/res/xml-sw600dp/kbd_qwerty_row2.xml
rename to java/res/xml-sw600dp/row_qwerty2.xml
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/row_qwerty3.xml
similarity index 92%
rename from java/res/xml-sw600dp/kbd_qwerty_row3.xml
rename to java/res/xml-sw600dp/row_qwerty3.xml
index 1a86bbfd4537bad63b167a6ec35cd1b595dd96d7..3d19904a11fd9ccef14c3a0fb4deaa91c0dcbb3a 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw600dp/row_qwerty3.xml
@@ -46,9 +46,9 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley"
+ latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth" />
</Row>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/row_qwerty4.xml
similarity index 91%
rename from java/res/xml-sw600dp/kbd_qwerty_row4.xml
rename to java/res/xml-sw600dp/row_qwerty4.xml
index 54ca22b67234d8094ff867e945e2c89828f00a92..bf6bcb1c6dc94d3d3fc144f6e51e6cc47fabad45 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/row_qwerty4.xml
@@ -59,18 +59,18 @@
latin:languageCode="iw"
>
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
</case>
<!-- not languageCode="iw" -->
<default>
<include
- latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
+ latin:keyboardLayout="@xml/keys_apostrophe_dash" />
</default>
</switch>
<Spacer
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
similarity index 97%
rename from java/res/xml-sw600dp/kbd_rows_arabic.xml
rename to java/res/xml-sw600dp/rows_arabic.xml
index f96564f9d934067f2869cf48d802151e2770989c..8d4901be3f44ca3d24de9e061443736ce8864747 100644
--- a/java/res/xml-sw600dp/kbd_rows_arabic.xml
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.0%p"
>
@@ -146,7 +146,7 @@
latin:keyWidth="8.0%p"
>
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley" />
+ latin:keyboardLayout="@xml/key_smiley" />
<!-- \u0626: ARABIC LETTER YEH WITH HAMZA ABOVE -->
<Key
latin:keyLabel="ئ" />
@@ -184,5 +184,5 @@
latin:keyLabel="د" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml
similarity index 94%
rename from java/res/xml-sw600dp/kbd_rows_azerty.xml
rename to java/res/xml-sw600dp/rows_azerty.xml
index 9e2bc69b527d70c47b7ae21a1436b45f3900b244..c9a9dab06596c694a54c5cceebfac190c2438fb8 100644
--- a/java/res/xml-sw600dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw600dp/rows_azerty.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.5%p"
>
@@ -121,12 +121,12 @@
<Key
latin:keyLabel="\'" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley"
+ latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml
similarity index 92%
rename from java/res/xml-sw600dp/kbd_rows_bulgarian.xml
rename to java/res/xml-sw600dp/rows_bulgarian.xml
index 22e7435163a3f0856619a4a02f7a2bf397de4381..b464158f0da2a5bb98dd156b50b7c33f312f18a0 100644
--- a/java/res/xml-sw600dp/kbd_rows_bulgarian.xml
+++ b/java/res/xml-sw600dp/rows_bulgarian.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.692%p"
>
@@ -106,12 +106,12 @@
<Key
latin:keyLabel="ÑŽ" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley"
+ latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
similarity index 92%
rename from java/res/xml-sw600dp/kbd_rows_hebrew.xml
rename to java/res/xml-sw600dp/rows_hebrew.xml
index 5c4194cd4f377ee8b56c1a9471455a44352be84d..71fb463761aea678a22beb4b3fbdd8466fb3cbe6 100644
--- a/java/res/xml-sw600dp/kbd_rows_hebrew.xml
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -22,12 +22,12 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.0%p"
>
<include
- latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
+ latin:keyboardLayout="@xml/keys_apostrophe_dash" />
<Key
latin:keyLabel="ק" />
<Key
@@ -81,7 +81,7 @@
latin:keyWidth="8.9%p"
>
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley"
+ latin:keyboardLayout="@xml/key_smiley"
latin:keyWidth="10.0%p" />
<Key
latin:keyLabel="×–"
@@ -111,5 +111,5 @@
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
similarity index 98%
rename from java/res/xml-sw600dp/kbd_rows_number_normal.xml
rename to java/res/xml-sw600dp/rows_number_normal.xml
index 1e39f39f25bd67e54d023aeba09f944cca1cfb1f..f7eb9505aa0ecb3069a4029ad62f56581fcd638e 100644
--- a/java/res/xml-sw600dp/kbd_rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -133,6 +133,6 @@
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml
similarity index 97%
rename from java/res/xml-sw600dp/kbd_rows_number_password.xml
rename to java/res/xml-sw600dp/rows_number_password.xml
index 4d9633473001c899669e1a7f5198f48bd951aa2d..c3f21e1063f2d96d18c94ac604b42a1d205627cc 100644
--- a/java/res/xml-sw600dp/kbd_rows_number_password.xml
+++ b/java/res/xml-sw600dp/rows_number_password.xml
@@ -76,6 +76,6 @@
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
similarity index 95%
rename from java/res/xml-sw600dp/kbd_rows_phone.xml
rename to java/res/xml-sw600dp/rows_phone.xml
index 69d058fd88b09e200eb45699c41dae56100ee894..1bad7ca72c4fee2e1e58268e9f2ee138d65cf206 100644
--- a/java/res/xml-sw600dp/kbd_rows_phone.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
@@ -117,6 +117,6 @@
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_phone_shift.xml b/java/res/xml-sw600dp/rows_phone_shift.xml
similarity index 96%
rename from java/res/xml-sw600dp/kbd_rows_phone_shift.xml
rename to java/res/xml-sw600dp/rows_phone_shift.xml
index 04db6780f5f972b37a8a0b9dc6f68b90830f68fd..c2f00fe8b81314501455022a7f6d2a8adac4b151 100644
--- a/java/res/xml-sw600dp/kbd_rows_phone_shift.xml
+++ b/java/res/xml-sw600dp/rows_phone_shift.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
@@ -127,6 +127,6 @@
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml
similarity index 75%
rename from java/res/xml-sw600dp/kbd_rows_qwerty.xml
rename to java/res/xml-sw600dp/rows_qwerty.xml
index a2d26b3de6416a5ada10ddea348ea8d382202994..eb41c5087419843d5b4b9af87e515730bc5feabd 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwerty.xml
+++ b/java/res/xml-sw600dp/rows_qwerty.xml
@@ -22,13 +22,13 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml
similarity index 90%
rename from java/res/xml-sw600dp/kbd_rows_qwertz.xml
rename to java/res/xml-sw600dp/rows_qwertz.xml
index bc08d07ce53b3247a64648a485ff97e32791d2d3..fe93a705e2344695336c6af5fff99ebd7062e118 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw600dp/rows_qwertz.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.0%p"
>
@@ -62,7 +62,7 @@
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<Row
latin:keyWidth="8.9%p"
>
@@ -88,12 +88,12 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley"
+ latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml b/java/res/xml-sw600dp/rows_scandinavian.xml
similarity index 94%
rename from java/res/xml-sw600dp/kbd_rows_scandinavian.xml
rename to java/res/xml-sw600dp/rows_scandinavian.xml
index 6d9164eb2b72480500396f02f08fe2da4df7d3d4..f334f8b5e6cf9235df7d7258940c980595124347 100644
--- a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw600dp/rows_scandinavian.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.9%p"
>
@@ -129,12 +129,12 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley"
+ latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_serbian.xml b/java/res/xml-sw600dp/rows_serbian.xml
similarity index 92%
rename from java/res/xml-sw600dp/kbd_rows_serbian.xml
rename to java/res/xml-sw600dp/rows_serbian.xml
index 7e918bb91aeb6a52d1fab097ac06d451ed4b434a..c21fd4cb7a8ce4ea36b4f30e2398b547abad9c7b 100644
--- a/java/res/xml-sw600dp/kbd_rows_serbian.xml
+++ b/java/res/xml-sw600dp/rows_serbian.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.0%p"
>
@@ -109,12 +109,12 @@
<Key
latin:keyLabel="ж" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley"
+ latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_slavic.xml b/java/res/xml-sw600dp/rows_slavic.xml
similarity index 93%
rename from java/res/xml-sw600dp/kbd_rows_slavic.xml
rename to java/res/xml-sw600dp/rows_slavic.xml
index aa5adfd018a2e7314d92b641fa0c9ae21e9e29e8..889a438b5f64fdc98a75190d01892859839058a6 100644
--- a/java/res/xml-sw600dp/kbd_rows_slavic.xml
+++ b/java/res/xml-sw600dp/rows_slavic.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.60%p"
>
@@ -115,12 +115,12 @@
<Key
latin:keyLabel="ÑŽ" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<include
- latin:keyboardLayout="@xml/kbd_row3_smiley"
+ latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml
similarity index 89%
rename from java/res/xml-sw600dp/kbd_rows_spanish.xml
rename to java/res/xml-sw600dp/rows_spanish.xml
index 8506af697906969b08f5789730ad7603289a2202..b516bebfbf615d2b81076df618081b0c735a9370 100644
--- a/java/res/xml-sw600dp/kbd_rows_spanish.xml
+++ b/java/res/xml-sw600dp/rows_spanish.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<Row
latin:keyWidth="8.5%p"
>
@@ -61,7 +61,7 @@
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
similarity index 96%
rename from java/res/xml-sw600dp/kbd_rows_symbols.xml
rename to java/res/xml-sw600dp/rows_symbols.xml
index bb48fe734b50d528c70ca27f8ec6a775cb49a856..e345a23f7c215a9104b88af80995c82d5a40a913 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw600dp/rows_symbols.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.0%p"
>
@@ -167,6 +167,6 @@
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
similarity index 95%
rename from java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
rename to java/res/xml-sw600dp/rows_symbols_shift.xml
index 8e47515028721a5f6183ebf81dfae4cfd768905b..d3531dd39ac56d2e6fe97c399ec1db6604fc0401 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.0%p"
>
@@ -127,6 +127,6 @@
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f2" />
+ latin:keyboardLayout="@xml/key_f2" />
</Row>
</merge>
diff --git a/java/res/xml-sw768dp-land/kbd_number.xml b/java/res/xml-sw768dp-land/kbd_number.xml
index 3106dc34e7e49a54ba5e1b29eddd9336f6b05836..3ad25a3922c1ac7f72cbe9846cdc59f84577a692 100644
--- a/java/res/xml-sw768dp-land/kbd_number.xml
+++ b/java/res/xml-sw768dp-land/kbd_number.xml
@@ -24,5 +24,5 @@
latin:keyWidth="13.250%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_number" />
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml-sw768dp-land/kbd_phone.xml b/java/res/xml-sw768dp-land/kbd_phone.xml
index 7c7af573907dad3b3902c2e669edd3f15d4dab92..abe7e7c41de84ba69840689300183e6a3f248570 100644
--- a/java/res/xml-sw768dp-land/kbd_phone.xml
+++ b/java/res/xml-sw768dp-land/kbd_phone.xml
@@ -24,5 +24,5 @@
latin:keyWidth="13.250%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-sw768dp-land/kbd_phone_shift.xml b/java/res/xml-sw768dp-land/kbd_phone_shift.xml
index 04b018cfe047d3887df209332513a7208c81d8cb..4ef8e96a12888997d30e49519fa89ef8e9d28477 100644
--- a/java/res/xml-sw768dp-land/kbd_phone_shift.xml
+++ b/java/res/xml-sw768dp-land/kbd_phone_shift.xml
@@ -24,5 +24,5 @@
latin:keyWidth="13.250%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
+ latin:keyboardLayout="@xml/rows_phone_shift" />
</Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_number.xml b/java/res/xml-sw768dp/kbd_number.xml
index 74ce854cf794b2aa2da937ff2a90ac1e22f37e06..b20123c80c74bf7cc4d798177052f97e7eaf32b8 100644
--- a/java/res/xml-sw768dp/kbd_number.xml
+++ b/java/res/xml-sw768dp/kbd_number.xml
@@ -23,5 +23,5 @@
latin:keyWidth="13.250%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_number" />
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_phone.xml b/java/res/xml-sw768dp/kbd_phone.xml
index 0a9b8b53ad3365491bf2794aeae7676146c18829..fa9bf1bf49ecaeba180f247648e9d38cb4075aee 100644
--- a/java/res/xml-sw768dp/kbd_phone.xml
+++ b/java/res/xml-sw768dp/kbd_phone.xml
@@ -23,5 +23,5 @@
latin:keyWidth="13.250%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_phone_shift.xml b/java/res/xml-sw768dp/kbd_phone_shift.xml
index 055d70cd21c3d90aff1423e946cbbda88116273b..a56afcc0cad0699d2e238cc13243f17bdd3fa201 100644
--- a/java/res/xml-sw768dp/kbd_phone_shift.xml
+++ b/java/res/xml-sw768dp/kbd_phone_shift.xml
@@ -23,5 +23,5 @@
latin:keyWidth="13.250%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
+ latin:keyboardLayout="@xml/rows_phone_shift" />
</Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/key_styles_common.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_key_styles.xml
rename to java/res/xml-sw768dp/key_styles_common.xml
diff --git a/java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml b/java/res/xml-sw768dp/keys_apostrophe_dash.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_row4_apostrophe_dash.xml
rename to java/res/xml-sw768dp/keys_apostrophe_dash.xml
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row1.xml b/java/res/xml-sw768dp/row_qwerty1.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_qwerty_row1.xml
rename to java/res/xml-sw768dp/row_qwerty1.xml
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row2.xml b/java/res/xml-sw768dp/row_qwerty2.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_qwerty_row2.xml
rename to java/res/xml-sw768dp/row_qwerty2.xml
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row3.xml b/java/res/xml-sw768dp/row_qwerty3.xml
similarity index 96%
rename from java/res/xml-sw768dp/kbd_qwerty_row3.xml
rename to java/res/xml-sw768dp/row_qwerty3.xml
index f2f137ea9488ce0580fb503ff0bbbe73479bf963..e2bb2e54690ac1eff662ba92474374dc1e074022 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw768dp/row_qwerty3.xml
@@ -46,7 +46,7 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p"
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row4.xml b/java/res/xml-sw768dp/row_qwerty4.xml
similarity index 95%
rename from java/res/xml-sw768dp/kbd_qwerty_row4.xml
rename to java/res/xml-sw768dp/row_qwerty4.xml
index 1f00dff844ed6d4338784bae9a799637e951e5f0..c3ba911af99916f53df2d6aebd19de0373986989 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw768dp/row_qwerty4.xml
@@ -92,11 +92,11 @@
latin:languageCode="iw"
>
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
</case>
<default>
<include
- latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
+ latin:keyboardLayout="@xml/keys_apostrophe_dash" />
</default>
</switch>
<switch>
diff --git a/java/res/xml-sw768dp/kbd_rows_arabic.xml b/java/res/xml-sw768dp/rows_arabic.xml
similarity index 98%
rename from java/res/xml-sw768dp/kbd_rows_arabic.xml
rename to java/res/xml-sw768dp/rows_arabic.xml
index 412d5d98ac192b48d84e8c6a2159cdc52839bb9a..0e4aee4ebf119cc93567fceb1df1145c5537678a 100644
--- a/java/res/xml-sw768dp/kbd_rows_arabic.xml
+++ b/java/res/xml-sw768dp/rows_arabic.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.375%p"
>
@@ -189,5 +189,5 @@
latin:keyLabel="د" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_azerty.xml b/java/res/xml-sw768dp/rows_azerty.xml
similarity index 96%
rename from java/res/xml-sw768dp/kbd_rows_azerty.xml
rename to java/res/xml-sw768dp/rows_azerty.xml
index 127f7161899ca201fc6a1597066014be622dc147..c97ac408945d4920206ad9d8e4b9f6ab6b3a67cd 100644
--- a/java/res/xml-sw768dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw768dp/rows_azerty.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.282%p"
>
@@ -131,12 +131,12 @@
latin:keyHintLabel=":"
latin:moreKeys=":" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_bulgarian.xml b/java/res/xml-sw768dp/rows_bulgarian.xml
similarity index 94%
rename from java/res/xml-sw768dp/kbd_rows_bulgarian.xml
rename to java/res/xml-sw768dp/rows_bulgarian.xml
index 42b3da52594c7e7b87d3fb251bdf0c5081981942..57f39b4202fa689206ca84754ba4f3608992a91c 100644
--- a/java/res/xml-sw768dp/kbd_rows_bulgarian.xml
+++ b/java/res/xml-sw768dp/rows_bulgarian.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.333%p"
>
@@ -112,11 +112,11 @@
<Key
latin:keyLabel="ÑŽ" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_hebrew.xml b/java/res/xml-sw768dp/rows_hebrew.xml
similarity index 94%
rename from java/res/xml-sw768dp/kbd_rows_hebrew.xml
rename to java/res/xml-sw768dp/rows_hebrew.xml
index 5f4b556b66b0d497d3773f42c8de69210f883fb9..755afc86d3604ff9f315ddb46c0ffb8a1e70d98c 100644
--- a/java/res/xml-sw768dp/kbd_rows_hebrew.xml
+++ b/java/res/xml-sw768dp/rows_hebrew.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.282%p"
>
@@ -31,7 +31,7 @@
latin:keyLabelFlags="alignLeft"
latin:keyWidth="7.969%p" />
<include
- latin:keyboardLayout="@xml/kbd_row4_apostrophe_dash" />
+ latin:keyboardLayout="@xml/keys_apostrophe_dash" />
<Key
latin:keyLabel="ק" />
<Key
@@ -116,5 +116,5 @@
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_number_normal.xml b/java/res/xml-sw768dp/rows_number_normal.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_number_normal.xml
rename to java/res/xml-sw768dp/rows_number_normal.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_number_password.xml b/java/res/xml-sw768dp/rows_number_password.xml
similarity index 100%
rename from java/res/xml-sw768dp/kbd_rows_number_password.xml
rename to java/res/xml-sw768dp/rows_number_password.xml
diff --git a/java/res/xml-sw768dp/kbd_rows_phone.xml b/java/res/xml-sw768dp/rows_phone.xml
similarity index 97%
rename from java/res/xml-sw768dp/kbd_rows_phone.xml
rename to java/res/xml-sw768dp/rows_phone.xml
index 1320cf0bac3b1c774ed10e57ab5742311e71e725..da90895d03d3b0c8c970a1d6f4e035cbd5a448af 100644
--- a/java/res/xml-sw768dp/kbd_rows_phone.xml
+++ b/java/res/xml-sw768dp/rows_phone.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<Key
latin:keyStyle="numTabKeyStyle"
diff --git a/java/res/xml-sw768dp/kbd_rows_phone_shift.xml b/java/res/xml-sw768dp/rows_phone_shift.xml
similarity index 97%
rename from java/res/xml-sw768dp/kbd_rows_phone_shift.xml
rename to java/res/xml-sw768dp/rows_phone_shift.xml
index e749790a01933b514a11729c43d07bcdec01b3f4..5861998aefa8dc7b142e1766bb6cff0ebd089151 100644
--- a/java/res/xml-sw768dp/kbd_rows_phone_shift.xml
+++ b/java/res/xml-sw768dp/rows_phone_shift.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<Key
latin:keyStyle="numTabKeyStyle"
diff --git a/java/res/xml-sw768dp/kbd_rows_qwerty.xml b/java/res/xml-sw768dp/rows_qwerty.xml
similarity index 75%
rename from java/res/xml-sw768dp/kbd_rows_qwerty.xml
rename to java/res/xml-sw768dp/rows_qwerty.xml
index 6237712f6473f95965417ee9bb0cb6c14bbbe99c..71be44e31b80c27500448a3b510155acc252bab6 100644
--- a/java/res/xml-sw768dp/kbd_rows_qwerty.xml
+++ b/java/res/xml-sw768dp/rows_qwerty.xml
@@ -22,13 +22,13 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_qwertz.xml b/java/res/xml-sw768dp/rows_qwertz.xml
similarity index 92%
rename from java/res/xml-sw768dp/kbd_rows_qwertz.xml
rename to java/res/xml-sw768dp/rows_qwertz.xml
index 7a7a0468d21be73737ddf20d4b53f096dd0115fb..05a2a9c035e7d1ff1a9f9dbab2eb08cacada43a6 100644
--- a/java/res/xml-sw768dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw768dp/rows_qwertz.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.282%p"
>
@@ -66,7 +66,7 @@
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<Row
latin:keyWidth="8.047%p"
>
@@ -92,12 +92,12 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-13.750%p"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml b/java/res/xml-sw768dp/rows_scandinavian.xml
similarity index 96%
rename from java/res/xml-sw768dp/kbd_rows_scandinavian.xml
rename to java/res/xml-sw768dp/rows_scandinavian.xml
index 334b76d6a1b3058b361336f42b76f2e54fe918ee..373617bfc487ece2d564e2a2d426e0e98da36faa 100644
--- a/java/res/xml-sw768dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw768dp/rows_scandinavian.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.375%p"
>
@@ -134,12 +134,12 @@
<Key
latin:keyLabel="m" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-12.750%p"
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_serbian.xml b/java/res/xml-sw768dp/rows_serbian.xml
similarity index 94%
rename from java/res/xml-sw768dp/kbd_rows_serbian.xml
rename to java/res/xml-sw768dp/rows_serbian.xml
index 0b1773e40629b96b7256b435b912f6690bdf2861..2e9e1405d8b4a23c75f8059737a80c2ff52e2649 100644
--- a/java/res/xml-sw768dp/kbd_rows_serbian.xml
+++ b/java/res/xml-sw768dp/rows_serbian.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.125%p"
>
@@ -112,12 +112,12 @@
<Key
latin:keyLabel="м" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-13.750%p"
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_slavic.xml b/java/res/xml-sw768dp/rows_slavic.xml
similarity index 95%
rename from java/res/xml-sw768dp/kbd_rows_slavic.xml
rename to java/res/xml-sw768dp/rows_slavic.xml
index 4c9128d86717e970278880e73c2d73a5ae955d94..86b4498ff4cd440bf3fbc7dd9bea47f6fe404e44 100644
--- a/java/res/xml-sw768dp/kbd_rows_slavic.xml
+++ b/java/res/xml-sw768dp/rows_slavic.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.125%p"
>
@@ -121,11 +121,11 @@
<Key
latin:keyLabel="ÑŽ" />
<include
- latin:keyboardLayout="@xml/kbd_row3_comma_period" />
+ latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_spanish.xml b/java/res/xml-sw768dp/rows_spanish.xml
similarity index 89%
rename from java/res/xml-sw768dp/kbd_rows_spanish.xml
rename to java/res/xml-sw768dp/rows_spanish.xml
index 7e543b2fb602cbaf01d324f8101714695fadbcef..f626a451f8083220041c729aa48de3e0bbe1577c 100644
--- a/java/res/xml-sw768dp/kbd_rows_spanish.xml
+++ b/java/res/xml-sw768dp/rows_spanish.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<Row
latin:keyWidth="8.125%p"
>
@@ -64,7 +64,7 @@
latin:keyWidth="fillBoth" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_symbols.xml b/java/res/xml-sw768dp/rows_symbols.xml
similarity index 98%
rename from java/res/xml-sw768dp/kbd_rows_symbols.xml
rename to java/res/xml-sw768dp/rows_symbols.xml
index 641fe1934e26545d02d914f187e631a2ee60a6ca..820e5f7d2283698493d8802f232d87cf2ebfa04b 100644
--- a/java/res/xml-sw768dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw768dp/rows_symbols.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="8.282%p"
>
diff --git a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw768dp/rows_symbols_shift.xml
similarity index 97%
rename from java/res/xml-sw768dp/kbd_rows_symbols_shift.xml
rename to java/res/xml-sw768dp/rows_symbols_shift.xml
index f6b47a86f64753bb68d9cfd8686b3724e70d6430..80735b697ee20fef8367beef2ea96fa33be1a5d6 100644
--- a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw768dp/rows_symbols_shift.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="8.282%p"
>
diff --git a/java/res/xml/kbd_arabic.xml b/java/res/xml/kbd_arabic.xml
index 91b22810b1a6f1c5bf638ab2d3b7de5ee047bcce..d7f77cc3a0ae20157ae789d16e0256ba97f5a908 100644
--- a/java/res/xml/kbd_arabic.xml
+++ b/java/res/xml/kbd_arabic.xml
@@ -23,5 +23,5 @@
latin:isRtlKeyboard="true"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_arabic" />
+ latin:keyboardLayout="@xml/rows_arabic" />
</Keyboard>
diff --git a/java/res/xml/kbd_azerty.xml b/java/res/xml/kbd_azerty.xml
index 3abaf648adb764e5b16b2980fd534720d1682f98..7bafe5bca00cdb208bb6d526b1c8800c11823174 100644
--- a/java/res/xml/kbd_azerty.xml
+++ b/java/res/xml/kbd_azerty.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_azerty" />
+ latin:keyboardLayout="@xml/rows_azerty" />
</Keyboard>
diff --git a/java/res/xml/kbd_bulgarian.xml b/java/res/xml/kbd_bulgarian.xml
index f114383229bab3d609da87ed1001cb7d716316ea..a651991c0900911599c61e8c5430f3e8d9abcbd0 100644
--- a/java/res/xml/kbd_bulgarian.xml
+++ b/java/res/xml/kbd_bulgarian.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_bulgarian" />
+ latin:keyboardLayout="@xml/rows_bulgarian" />
</Keyboard>
diff --git a/java/res/xml/kbd_hebrew.xml b/java/res/xml/kbd_hebrew.xml
index f25aaddfacd31b7052b85826ba3edb125c08ed6a..3d574db598f0fd0d3424bbe60339ec25f0eac1f9 100644
--- a/java/res/xml/kbd_hebrew.xml
+++ b/java/res/xml/kbd_hebrew.xml
@@ -23,5 +23,5 @@
latin:isRtlKeyboard="true"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_hebrew" />
+ latin:keyboardLayout="@xml/rows_hebrew" />
</Keyboard>
diff --git a/java/res/xml/kbd_number.xml b/java/res/xml/kbd_number.xml
index 38dd6bf629df4b5856aa5e6b8ccf87a0863a7791..8b0deea9726e29a2a249bba4e91e9a47fa90d352 100644
--- a/java/res/xml/kbd_number.xml
+++ b/java/res/xml/kbd_number.xml
@@ -23,5 +23,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_number" />
+ latin:keyboardLayout="@xml/rows_number" />
</Keyboard>
diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
index b550f17c58243ed160c71673935dee2b59d15a9a..91637b62c395a89dd90eaa4477369dfd6908ca61 100644
--- a/java/res/xml/kbd_phone.xml
+++ b/java/res/xml/kbd_phone.xml
@@ -23,5 +23,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone" />
+ latin:keyboardLayout="@xml/rows_phone" />
</Keyboard>
diff --git a/java/res/xml/kbd_phone_shift.xml b/java/res/xml/kbd_phone_shift.xml
index eea823fc0dedab1f7f18f6d5cf2c914ca92a17b8..104f33f5b3c0f241079fd78b3f392b7f31e4ded3 100644
--- a/java/res/xml/kbd_phone_shift.xml
+++ b/java/res/xml/kbd_phone_shift.xml
@@ -23,5 +23,5 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
+ latin:keyboardLayout="@xml/rows_phone_shift" />
</Keyboard>
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index ae0146c82db24e303f5e46f586dbff889dc5036d..2f49b943ac1d4c8382b6bf491ceab72af0fda902 100644
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_qwerty" />
+ latin:keyboardLayout="@xml/rows_qwerty" />
</Keyboard>
diff --git a/java/res/xml/kbd_qwertz.xml b/java/res/xml/kbd_qwertz.xml
index 5bcceb2f692c66e141b938ce9a74f5d4327eade0..9f7e9019ced7a27d3a9392e1cd23949f99193dc1 100644
--- a/java/res/xml/kbd_qwertz.xml
+++ b/java/res/xml/kbd_qwertz.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_qwertz" />
+ latin:keyboardLayout="@xml/rows_qwertz" />
</Keyboard>
diff --git a/java/res/xml/kbd_scandinavian.xml b/java/res/xml/kbd_scandinavian.xml
index 4caa9894c0e330782825f5dea53189cdcf90061c..46ddfcb8fb5c9de06837731ec6563e7784d98fc6 100644
--- a/java/res/xml/kbd_scandinavian.xml
+++ b/java/res/xml/kbd_scandinavian.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_scandinavian" />
+ latin:keyboardLayout="@xml/rows_scandinavian" />
</Keyboard>
diff --git a/java/res/xml/kbd_serbian.xml b/java/res/xml/kbd_serbian.xml
index 40b71997827e60f1b56e99e4b2cad11d91645421..05597c4eb68cd413bdc7f53149f1a1ccbc63974c 100644
--- a/java/res/xml/kbd_serbian.xml
+++ b/java/res/xml/kbd_serbian.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_serbian" />
+ latin:keyboardLayout="@xml/rows_serbian" />
</Keyboard>
diff --git a/java/res/xml/kbd_slavic.xml b/java/res/xml/kbd_slavic.xml
index 6207d2939b8f7122733307d11b4d0f0d1a7dc995..ca891c000dff950e15743dad41647377049c36e6 100644
--- a/java/res/xml/kbd_slavic.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_slavic" />
+ latin:keyboardLayout="@xml/rows_slavic" />
</Keyboard>
diff --git a/java/res/xml/kbd_spanish.xml b/java/res/xml/kbd_spanish.xml
index cfb8c6c27eab95201d1e7226284fab490b4b300e..6ce2b5d24c887966461eef9114076bbc916566d6 100644
--- a/java/res/xml/kbd_spanish.xml
+++ b/java/res/xml/kbd_spanish.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_spanish" />
+ latin:keyboardLayout="@xml/rows_spanish" />
</Keyboard>
diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml
index 737f684a70a57e0761f0eb34411dc1abfc7c936b..f6612a2f73a62d84ed205c7d7e91df148a0473de 100644
--- a/java/res/xml/kbd_symbols.xml
+++ b/java/res/xml/kbd_symbols.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_symbols" />
+ latin:keyboardLayout="@xml/rows_symbols" />
</Keyboard>
diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml
index 9c163d69419691d28f9620ad9f2dfd9cea1190d5..41a5571ef01eadc1556685ad379ab944cae7edf2 100644
--- a/java/res/xml/kbd_symbols_shift.xml
+++ b/java/res/xml/kbd_symbols_shift.xml
@@ -22,5 +22,5 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_symbols_shift" />
+ latin:keyboardLayout="@xml/rows_symbols_shift" />
</Keyboard>
diff --git a/java/res/xml/kbd_qwerty_f1.xml b/java/res/xml/key_f1.xml
similarity index 100%
rename from java/res/xml/kbd_qwerty_f1.xml
rename to java/res/xml/key_f1.xml
diff --git a/java/res/xml/kbd_settings_or_tab.xml b/java/res/xml/key_settings_or_tab.xml
similarity index 100%
rename from java/res/xml/kbd_settings_or_tab.xml
rename to java/res/xml/key_settings_or_tab.xml
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/key_styles_common.xml
similarity index 100%
rename from java/res/xml/kbd_key_styles.xml
rename to java/res/xml/key_styles_common.xml
diff --git a/java/res/xml/kbd_currency_key_styles.xml b/java/res/xml/key_styles_currency.xml
similarity index 91%
rename from java/res/xml/kbd_currency_key_styles.xml
rename to java/res/xml/key_styles_currency.xml
index 225888337a5baa1d68d21d77a9f3690aef739d40..3e4afdfb589be45ae03e64786540d0c3d80ec20f 100644
--- a/java/res/xml/kbd_currency_key_styles.xml
+++ b/java/res/xml/key_styles_currency.xml
@@ -26,7 +26,7 @@
latin:passwordInput="true"
>
<include
- latin:keyboardLayout="@xml/kbd_currency_dollar_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency_dollar" />
</case>
<!-- Countries using Euro currency, 23 countries as for January 2011. -->
1. Andorra (ca_AD, ca_ES)
@@ -62,19 +62,19 @@
latin:localeCode="da|de|es|el|fi|fr|it|nl|sk|sl|pt_PT|tr"
>
<include
- latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency_euro" />
</case>
<case
latin:languageCode="ca|et|lb|mt|sla"
>
<include
- latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency_euro" />
</case>
<case
latin:countryCode="AD|AT|BE|CY|EE|FI|FR|DE|GR|IE|IT|XK|LU|MT|MO|ME|NL|PT|SM|SK|SI|ES|VA"
>
<include
- latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency_euro" />
</case>
<case
latin:languageCode="iw"
@@ -121,7 +121,7 @@
</case>
<default>
<include
- latin:keyboardLayout="@xml/kbd_currency_dollar_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency_dollar" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/kbd_currency_dollar_key_styles.xml b/java/res/xml/key_styles_currency_dollar.xml
similarity index 100%
rename from java/res/xml/kbd_currency_dollar_key_styles.xml
rename to java/res/xml/key_styles_currency_dollar.xml
diff --git a/java/res/xml/kbd_currency_euro_key_styles.xml b/java/res/xml/key_styles_currency_euro.xml
similarity index 100%
rename from java/res/xml/kbd_currency_euro_key_styles.xml
rename to java/res/xml/key_styles_currency_euro.xml
diff --git a/java/res/xml/kbd_numkey_styles.xml b/java/res/xml/key_styles_number.xml
similarity index 100%
rename from java/res/xml/kbd_numkey_styles.xml
rename to java/res/xml/key_styles_number.xml
diff --git a/java/res/xml/kbd_symbols_f1.xml b/java/res/xml/key_symbols_f1.xml
similarity index 100%
rename from java/res/xml/kbd_symbols_f1.xml
rename to java/res/xml/key_symbols_f1.xml
diff --git a/java/res/xml/kbd_row3_comma_period.xml b/java/res/xml/keys_comma_period.xml
similarity index 100%
rename from java/res/xml/kbd_row3_comma_period.xml
rename to java/res/xml/keys_comma_period.xml
diff --git a/java/res/xml/kbd_qwerty_row1.xml b/java/res/xml/row_qwerty1.xml
similarity index 100%
rename from java/res/xml/kbd_qwerty_row1.xml
rename to java/res/xml/row_qwerty1.xml
diff --git a/java/res/xml/kbd_qwerty_row2.xml b/java/res/xml/row_qwerty2.xml
similarity index 100%
rename from java/res/xml/kbd_qwerty_row2.xml
rename to java/res/xml/row_qwerty2.xml
diff --git a/java/res/xml/kbd_qwerty_row3.xml b/java/res/xml/row_qwerty3.xml
similarity index 100%
rename from java/res/xml/kbd_qwerty_row3.xml
rename to java/res/xml/row_qwerty3.xml
diff --git a/java/res/xml/kbd_qwerty_row4.xml b/java/res/xml/row_qwerty4.xml
similarity index 91%
rename from java/res/xml/kbd_qwerty_row4.xml
rename to java/res/xml/row_qwerty4.xml
index eb1e9b8b313e9dfabca6e3ce977ce467ed6e45b8..65500a65374fb28624effcede066abc8da910447 100644
--- a/java/res/xml/kbd_qwerty_row4.xml
+++ b/java/res/xml/row_qwerty4.xml
@@ -33,7 +33,7 @@
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="15%p" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f1" />
+ latin:keyboardLayout="@xml/key_f1" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50%p" />
@@ -49,9 +49,9 @@
latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="13.75%p" />
<include
- latin:keyboardLayout="@xml/kbd_settings_or_tab" />
+ latin:keyboardLayout="@xml/key_settings_or_tab" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f1" />
+ latin:keyboardLayout="@xml/key_f1" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="35.83%p" />
diff --git a/java/res/xml/kbd_symbols_row4.xml b/java/res/xml/row_symbols4.xml
similarity index 91%
rename from java/res/xml/kbd_symbols_row4.xml
rename to java/res/xml/row_symbols4.xml
index 864cf2b8efe164cc06b4012a7ad667cdbbc01061..8b094dd7e4c751ace9c12aba75386c68a9312642 100644
--- a/java/res/xml/kbd_symbols_row4.xml
+++ b/java/res/xml/row_symbols4.xml
@@ -33,7 +33,7 @@
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="15%p" />
<include
- latin:keyboardLayout="@xml/kbd_symbols_f1" />
+ latin:keyboardLayout="@xml/key_symbols_f1" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50%p" />
@@ -49,9 +49,9 @@
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="13.75%p" />
<include
- latin:keyboardLayout="@xml/kbd_settings_or_tab" />
+ latin:keyboardLayout="@xml/key_settings_or_tab" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_f1" />
+ latin:keyboardLayout="@xml/key_f1" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="35.83%p" />
diff --git a/java/res/xml/kbd_symbols_shift_row4.xml b/java/res/xml/row_symbols_shift4.xml
similarity index 97%
rename from java/res/xml/kbd_symbols_shift_row4.xml
rename to java/res/xml/row_symbols_shift4.xml
index 079112c782dfb4965b4eea74e5711a86b0fe3c66..4e13ac70459e7ab311855b31a3a06af7a78ad4f0 100644
--- a/java/res/xml/kbd_symbols_shift_row4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -54,7 +54,7 @@
latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="13.75%p" />
<include
- latin:keyboardLayout="@xml/kbd_settings_or_tab" />
+ latin:keyboardLayout="@xml/key_settings_or_tab" />
<!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
<!-- latin:keyLabelFlags="hasPopupHint" -->
<!-- latin:moreKeys="‟" -->
diff --git a/java/res/xml/kbd_rows_arabic.xml b/java/res/xml/rows_arabic.xml
similarity index 98%
rename from java/res/xml/kbd_rows_arabic.xml
rename to java/res/xml/rows_arabic.xml
index dd5123e4cef5541b72078d67a13f31af83606d23..dcee10ef556bf8f9fca22b073e14aa06204149c9 100644
--- a/java/res/xml/kbd_rows_arabic.xml
+++ b/java/res/xml/rows_arabic.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="10%p"
>
@@ -185,5 +185,5 @@
latin:visualInsetsLeft="1%p" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_azerty.xml b/java/res/xml/rows_azerty.xml
similarity index 97%
rename from java/res/xml/kbd_rows_azerty.xml
rename to java/res/xml/rows_azerty.xml
index 54fe546e37b0f560959bfa626d703e2ae81ea435..b7a0936b455a6dacca394e1c6f64ef71a6adea02 100644
--- a/java/res/xml/kbd_rows_azerty.xml
+++ b/java/res/xml/rows_azerty.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="10%p"
>
@@ -132,5 +132,5 @@
latin:visualInsetsLeft="1%p" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml
similarity index 96%
rename from java/res/xml/kbd_rows_bulgarian.xml
rename to java/res/xml/rows_bulgarian.xml
index 7b18361a9131608223056bf4450d3ed4f2cdbc68..9b5a5e6cfa7d76541e2976f625c2f5939653acd8 100644
--- a/java/res/xml/kbd_rows_bulgarian.xml
+++ b/java/res/xml/rows_bulgarian.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.091%p"
>
@@ -124,5 +124,5 @@
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_hebrew.xml b/java/res/xml/rows_hebrew.xml
similarity index 96%
rename from java/res/xml/kbd_rows_hebrew.xml
rename to java/res/xml/rows_hebrew.xml
index 6be8174c567be65b2c3542f2d3471a35145054ca..a64a09dbcfdedc12a1a43afaeac74a0dadce6bc9 100644
--- a/java/res/xml/kbd_rows_hebrew.xml
+++ b/java/res/xml/rows_hebrew.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="10%p"
>
@@ -105,5 +105,5 @@
<!-- Here is 5%p space -->
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_number.xml b/java/res/xml/rows_number.xml
similarity index 79%
rename from java/res/xml/kbd_rows_number.xml
rename to java/res/xml/rows_number.xml
index b066e0a03b4dceada761868579a5b7f276054f32..8da83be80b5b621974ca1e778619e98c5972f3eb 100644
--- a/java/res/xml/kbd_rows_number.xml
+++ b/java/res/xml/rows_number.xml
@@ -23,19 +23,19 @@
latin:keyWidth="26.67%p"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<switch>
<case
latin:passwordInput="true"
>
<include
- latin:keyboardLayout="@xml/kbd_rows_number_password" />
+ latin:keyboardLayout="@xml/rows_number_password" />
</case>
<default>
<include
- latin:keyboardLayout="@xml/kbd_rows_number_normal" />
+ latin:keyboardLayout="@xml/rows_number_normal" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/kbd_rows_number_normal.xml b/java/res/xml/rows_number_normal.xml
similarity index 100%
rename from java/res/xml/kbd_rows_number_normal.xml
rename to java/res/xml/rows_number_normal.xml
diff --git a/java/res/xml/kbd_rows_number_password.xml b/java/res/xml/rows_number_password.xml
similarity index 100%
rename from java/res/xml/kbd_rows_number_password.xml
rename to java/res/xml/rows_number_password.xml
diff --git a/java/res/xml/kbd_rows_phone.xml b/java/res/xml/rows_phone.xml
similarity index 94%
rename from java/res/xml/kbd_rows_phone.xml
rename to java/res/xml/rows_phone.xml
index 5500a60787e1039e74c8fb390ad1841975934227..94d0f7273f016d262fd37076864ad27846db6d39 100644
--- a/java/res/xml/kbd_rows_phone.xml
+++ b/java/res/xml/rows_phone.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<Key
latin:keyStyle="num1KeyStyle" />
diff --git a/java/res/xml/kbd_rows_phone_shift.xml b/java/res/xml/rows_phone_shift.xml
similarity index 95%
rename from java/res/xml/kbd_rows_phone_shift.xml
rename to java/res/xml/rows_phone_shift.xml
index b39e2da8dfc5f6af841bc7dd738eecbd3c85b855..1005206290477b2da9e74543c8f1c17a637b2483 100644
--- a/java/res/xml/kbd_rows_phone_shift.xml
+++ b/java/res/xml/rows_phone_shift.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_numkey_styles" />
+ latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<Key
latin:keyLabel="("
diff --git a/java/res/xml/kbd_rows_qwerty.xml b/java/res/xml/rows_qwerty.xml
similarity index 75%
rename from java/res/xml/kbd_rows_qwerty.xml
rename to java/res/xml/rows_qwerty.xml
index 6237712f6473f95965417ee9bb0cb6c14bbbe99c..71be44e31b80c27500448a3b510155acc252bab6 100644
--- a/java/res/xml/kbd_rows_qwerty.xml
+++ b/java/res/xml/rows_qwerty.xml
@@ -22,13 +22,13 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_qwertz.xml b/java/res/xml/rows_qwertz.xml
similarity index 95%
rename from java/res/xml/kbd_rows_qwertz.xml
rename to java/res/xml/rows_qwertz.xml
index 71bb601e6b7ac5cbc66313321c8dd7cf0d2792f4..e578f9aaa7a4f864ee8a74adbfec1c97088bf8b8 100644
--- a/java/res/xml/kbd_rows_qwertz.xml
+++ b/java/res/xml/rows_qwertz.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="10%p"
>
@@ -69,7 +69,7 @@
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row2" />
+ latin:keyboardLayout="@xml/row_qwerty2" />
<Row
latin:keyWidth="10%p"
>
@@ -101,5 +101,5 @@
latin:visualInsetsLeft="1%p" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_scandinavian.xml b/java/res/xml/rows_scandinavian.xml
similarity index 95%
rename from java/res/xml/kbd_rows_scandinavian.xml
rename to java/res/xml/rows_scandinavian.xml
index eb32c0055119ac0869743bdcac19523aa08d7640..2bd246b45de6ab2f91ce43421ca4bcd4f58fa14c 100644
--- a/java/res/xml/kbd_rows_scandinavian.xml
+++ b/java/res/xml/rows_scandinavian.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.091%p"
>
@@ -106,7 +106,7 @@
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_serbian.xml b/java/res/xml/rows_serbian.xml
similarity index 96%
rename from java/res/xml/kbd_rows_serbian.xml
rename to java/res/xml/rows_serbian.xml
index da4d695218da90b2798f57e655d399478000e4d7..beb04d5245642985aaaee71c0d6adc6a29fe971f 100644
--- a/java/res/xml/kbd_rows_serbian.xml
+++ b/java/res/xml/rows_serbian.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.091%p"
>
@@ -126,5 +126,5 @@
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_slavic.xml b/java/res/xml/rows_slavic.xml
similarity index 97%
rename from java/res/xml/kbd_rows_slavic.xml
rename to java/res/xml/rows_slavic.xml
index 426be72dd5779b4ddf33e4efc3d38c294d10bdf1..52f5af4c91c023fbce0084fe0262eff5254b8b3d 100644
--- a/java/res/xml/kbd_rows_slavic.xml
+++ b/java/res/xml/rows_slavic.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.091%p"
>
@@ -130,5 +130,5 @@
latin:keyWidth="fillRight" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_spanish.xml b/java/res/xml/rows_spanish.xml
similarity index 88%
rename from java/res/xml/kbd_rows_spanish.xml
rename to java/res/xml/rows_spanish.xml
index 03d631ee09b9332eff8edc92e9d728a8e730cf74..4b4cb9d1f6f8b2d03d0f47d1a8cf43c1f56b91f7 100644
--- a/java/res/xml/kbd_rows_spanish.xml
+++ b/java/res/xml/rows_spanish.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row1" />
+ latin:keyboardLayout="@xml/row_qwerty1" />
<Row
latin:keyWidth="10%p"
>
@@ -56,7 +56,7 @@
latin:keyLabel="ñ" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row3" />
+ latin:keyboardLayout="@xml/row_qwerty3" />
<include
- latin:keyboardLayout="@xml/kbd_qwerty_row4" />
+ latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/kbd_rows_symbols.xml b/java/res/xml/rows_symbols.xml
similarity index 96%
rename from java/res/xml/kbd_rows_symbols.xml
rename to java/res/xml/rows_symbols.xml
index c5bcb14c3d0c1fef41ff725592a7660b4bcb897b..fe9efbbc607850516db38a297459fe88ccb11f6f 100644
--- a/java/res/xml/kbd_rows_symbols.xml
+++ b/java/res/xml/rows_symbols.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="10%p"
>
@@ -126,5 +126,5 @@
latin:visualInsetsLeft="1%p" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_symbols_row4" />
+ latin:keyboardLayout="@xml/row_symbols4" />
</merge>
diff --git a/java/res/xml/kbd_rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
similarity index 94%
rename from java/res/xml/kbd_rows_symbols_shift.xml
rename to java/res/xml/rows_symbols_shift.xml
index 91654b04baab893c8c157509985f2d0a6f891adc..6d1838c7b5cdc800876e13ba1b0ddfa803bacc98 100644
--- a/java/res/xml/kbd_rows_symbols_shift.xml
+++ b/java/res/xml/rows_symbols_shift.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<include
- latin:keyboardLayout="@xml/kbd_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_common" />
<include
- latin:keyboardLayout="@xml/kbd_currency_key_styles" />
+ latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="10%p"
>
@@ -110,5 +110,5 @@
latin:visualInsetsLeft="1%p" />
</Row>
<include
- latin:keyboardLayout="@xml/kbd_symbols_shift_row4" />
+ latin:keyboardLayout="@xml/row_symbols_shift4" />
</merge>