diff --git a/java/res/values-cs/altchars.xml b/java/res/values-cs/altchars.xml
index db2213df7..d91a0e449 100644
--- a/java/res/values-cs/altchars.xml
+++ b/java/res/values-cs/altchars.xml
@@ -19,16 +19,16 @@
-->
áàâãäåæ
- éěèêë
- íìîï
- óòôõöœø
- ůúùûü
+ 3éěèêë
+ íìîï8
+ óòôõöœø9
+ ůúùûü7
š§ß
ňñ
čç
- ýÿ
+ ýÿ6
ď
- ř
- ť
+ ř4
+ ť5
ž
diff --git a/java/res/values-da/altchars.xml b/java/res/values-da/altchars.xml
index 7b313bdba..b1cc8b627 100644
--- a/java/res/values-da/altchars.xml
+++ b/java/res/values-da/altchars.xml
@@ -19,17 +19,17 @@
-->
áàâąã
- éèêëę€
- íìîï
- óòôõ
- úùûū
+ 3éèêëę€
+ íìîï8
+ óòôõ9
+ úùûū7
śšşß
ńñň
çćč
- ýÿü
+ ýÿü6
ðď
- ř
- ťþ
+ ř4
+ ťþ5
źžż
ł
w
diff --git a/java/res/values-de/altchars.xml b/java/res/values-de/altchars.xml
index edc2b082e..df27bce28 100644
--- a/java/res/values-de/altchars.xml
+++ b/java/res/values-de/altchars.xml
@@ -19,12 +19,13 @@
-->
ä
- èéêë
- ìíîï
- ö
- ùúûü
+ 3èéêë
+ ìíîï8
+ ö9
+ ùúûü7
§ß
ñ
ç
ýÿ
+ 6
diff --git a/java/res/values-el/altchars.xml b/java/res/values-el/altchars.xml
index c165b11c5..d3beafade 100644
--- a/java/res/values-el/altchars.xml
+++ b/java/res/values-el/altchars.xml
@@ -19,12 +19,12 @@
-->
àáâãäåæ
- èéêë
- ìíîï
- òóôõöœø
- ùúûü
+ 3èéêë
+ ìíîï8
+ òóôõöœø9
+ ùúûü7
§ß
ñ
ç
- ýÿ
+ ýÿ6
diff --git a/java/res/values-es-rUS/altchars.xml b/java/res/values-es-rUS/altchars.xml
index c165b11c5..d3beafade 100644
--- a/java/res/values-es-rUS/altchars.xml
+++ b/java/res/values-es-rUS/altchars.xml
@@ -19,12 +19,12 @@
-->
àáâãäåæ
- èéêë
- ìíîï
- òóôõöœø
- ùúûü
+ 3èéêë
+ ìíîï8
+ òóôõöœø9
+ ùúûü7
§ß
ñ
ç
- ýÿ
+ ýÿ6
diff --git a/java/res/values-es/altchars.xml b/java/res/values-es/altchars.xml
index 23aff7381..721062d2d 100644
--- a/java/res/values-es/altchars.xml
+++ b/java/res/values-es/altchars.xml
@@ -19,12 +19,12 @@
-->
á
- é
- ìíîï
- ó
- ùúûü
+ 3é
+ ìíîï8
+ ó9
+ ùúûü7
§ß
ñ
ç
- ýÿ
+ ýÿ6
diff --git a/java/res/values-fr/altchars.xml b/java/res/values-fr/altchars.xml
index c165b11c5..874d89dab 100644
--- a/java/res/values-fr/altchars.xml
+++ b/java/res/values-fr/altchars.xml
@@ -18,13 +18,16 @@
*/
-->
- àáâãäåæ
- èéêë
- ìíîï
- òóôõöœø
- ùúûü
+ 1àáâãäåæ
+ 3èéêë
+ ìíîï8
+ òóôõöœø9
+ ùúûü7
§ß
ñ
ç
- ýÿ
+ ýÿ6
+
+
+ 2
diff --git a/java/res/values-it/altchars.xml b/java/res/values-it/altchars.xml
index d1f940593..23960171b 100644
--- a/java/res/values-it/altchars.xml
+++ b/java/res/values-it/altchars.xml
@@ -19,12 +19,12 @@
-->
àá
- èé
- ìíîï
- òó
- ùúûü
+ 3èé
+ ìíîï8
+ òó9
+ ùúûü7
§
ñ
ç
- ýÿ
+ ýÿ6
diff --git a/java/res/values-ja/altchars.xml b/java/res/values-ja/altchars.xml
index c165b11c5..d3beafade 100644
--- a/java/res/values-ja/altchars.xml
+++ b/java/res/values-ja/altchars.xml
@@ -19,12 +19,12 @@
-->
àáâãäåæ
- èéêë
- ìíîï
- òóôõöœø
- ùúûü
+ 3èéêë
+ ìíîï8
+ òóôõöœø9
+ ùúûü7
§ß
ñ
ç
- ýÿ
+ ýÿ6
diff --git a/java/res/values-ko/altchars.xml b/java/res/values-ko/altchars.xml
index c165b11c5..d3beafade 100644
--- a/java/res/values-ko/altchars.xml
+++ b/java/res/values-ko/altchars.xml
@@ -19,12 +19,12 @@
-->
àáâãäåæ
- èéêë
- ìíîï
- òóôõöœø
- ùúûü
+ 3èéêë
+ ìíîï8
+ òóôõöœø9
+ ùúûü7
§ß
ñ
ç
- ýÿ
+ ýÿ6
diff --git a/java/res/values-nb/altchars.xml b/java/res/values-nb/altchars.xml
index 2019f44f1..6257dfc31 100644
--- a/java/res/values-nb/altchars.xml
+++ b/java/res/values-nb/altchars.xml
@@ -19,17 +19,17 @@
-->
äáàâąã
- éèêëę€
- íìîï
- öóòôõ
- üúùûū
+ 3éèêëę€
+ íìîï8
+ öóòôõ9
+ üúùûū7
śšşß
ńñň
çćč
- ýÿ
+ ýÿ6
ðď
- ř
- ťþ
+ ř4
+ ťþ5
źžż
ł
w
diff --git a/java/res/values-nl/altchars.xml b/java/res/values-nl/altchars.xml
index c165b11c5..d3beafade 100644
--- a/java/res/values-nl/altchars.xml
+++ b/java/res/values-nl/altchars.xml
@@ -19,12 +19,12 @@
-->
àáâãäåæ
- èéêë
- ìíîï
- òóôõöœø
- ùúûü
+ 3èéêë
+ ìíîï8
+ òóôõöœø9
+ ùúûü7
§ß
ñ
ç
- ýÿ
+ ýÿ6
diff --git a/java/res/values-pl/altchars.xml b/java/res/values-pl/altchars.xml
index 2b6ac2f3f..da6b5fd5c 100644
--- a/java/res/values-pl/altchars.xml
+++ b/java/res/values-pl/altchars.xml
@@ -19,14 +19,14 @@
-->
ą
- ę
- ìíîï
- ó
- ùúûü
+ ę3
+ ìíîï8
+ ó9
+ ùúûü7
ś
ń
ć
- ýÿ
+ ýÿ6
źż
ł
diff --git a/java/res/values-pt-rPT/altchars.xml b/java/res/values-pt-rPT/altchars.xml
index c165b11c5..d3beafade 100644
--- a/java/res/values-pt-rPT/altchars.xml
+++ b/java/res/values-pt-rPT/altchars.xml
@@ -19,12 +19,12 @@
-->
àáâãäåæ
- èéêë
- ìíîï
- òóôõöœø
- ùúûü
+ 3èéêë
+ ìíîï8
+ òóôõöœø9
+ ùúûü7
§ß
ñ
ç
- ýÿ
+ ýÿ6
diff --git a/java/res/values-pt/altchars.xml b/java/res/values-pt/altchars.xml
index c165b11c5..d3beafade 100644
--- a/java/res/values-pt/altchars.xml
+++ b/java/res/values-pt/altchars.xml
@@ -19,12 +19,12 @@
-->
àáâãäåæ
- èéêë
- ìíîï
- òóôõöœø
- ùúûü
+ 3èéêë
+ ìíîï8
+ òóôõöœø9
+ ùúûü7
§ß
ñ
ç
- ýÿ
+ ýÿ6
diff --git a/java/res/values-rm/altchars.xml b/java/res/values-rm/altchars.xml
index 543b0e29c..f17026fa9 100644
--- a/java/res/values-rm/altchars.xml
+++ b/java/res/values-rm/altchars.xml
@@ -19,12 +19,12 @@
-->
àáâãäåæ
- èéêë
- ìíîï
- òóöôõœø
- ùúûü
+ 3èéêë
+ ìíîï8
+ òóöôõœø9
+ ùúûü7
§ß
ñ
ç
- ýÿ
+ ýÿ6
diff --git a/java/res/values-ru/altchars.xml b/java/res/values-ru/altchars.xml
index f54586783..46241a62a 100644
--- a/java/res/values-ru/altchars.xml
+++ b/java/res/values-ru/altchars.xml
@@ -27,6 +27,6 @@
ñ
ç
ýÿ
- ё
+ ё5
ъ
diff --git a/java/res/values-sv/altchars.xml b/java/res/values-sv/altchars.xml
index 33a367bc2..4d26e6c47 100644
--- a/java/res/values-sv/altchars.xml
+++ b/java/res/values-sv/altchars.xml
@@ -19,17 +19,17 @@
-->
áàâąã
- éèêëę€
- íìîï
- óòôõ
- úùûū
+ 3éèêëę€
+ íìîï8
+ óòôõ9
+ úùûū7
śšşß
ńñň
çćč
- ýÿü
+ ýÿü6
ðď
- ř
- ťþ
+ ř4
+ ťþ5
źžż
ł
w
diff --git a/java/res/values-tr/altchars.xml b/java/res/values-tr/altchars.xml
index 55ad8a75e..4200d949e 100644
--- a/java/res/values-tr/altchars.xml
+++ b/java/res/values-tr/altchars.xml
@@ -19,13 +19,13 @@
-->
àáâãäåæ
- èéêë
- ìíîï
- öòóôõœø
- üùúû
+ 3èéêë
+ ìíîï8
+ öòóôõœø9
+ üùúû7
ş§ß
ñ
ç
- ýÿ
+ ýÿ6
ğ
\ No newline at end of file
diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml
index 53b4d5018..1794d4c86 100644
--- a/java/res/xml-da/kbd_qwerty.xml
+++ b/java/res/xml-da/kbd_qwerty.xml
@@ -34,10 +34,14 @@
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ android:keyLabel="p"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p" />
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml
index 414119a95..96bbd8c4f 100644
--- a/java/res/xml-da/kbd_qwerty_black.xml
+++ b/java/res/xml-da/kbd_qwerty_black.xml
@@ -34,10 +34,14 @@
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ android:keyLabel="p"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p" />
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
+ android:keyWidth="15%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_r" />
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_t" />
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_z" />
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_d" />
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_v" />
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
diff --git a/java/res/xml-de/kbd_qwerty_black.xml b/java/res/xml-de/kbd_qwerty_black.xml
index 29cb2d10d..791aa0263 100644
--- a/java/res/xml-de/kbd_qwerty_black.xml
+++ b/java/res/xml-de/kbd_qwerty_black.xml
@@ -28,19 +28,29 @@
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_r" />
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_t" />
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_z" />
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_d" />
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_v" />
+ android:keyWidth="15%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml
index 7a6c1ea07..1eabd6759 100644
--- a/java/res/xml-fr/kbd_qwerty.xml
+++ b/java/res/xml-fr/kbd_qwerty.xml
@@ -32,15 +32,21 @@
android:popupCharacters="@string/alternates_for_a"
android:keyEdgeFlags="left" />
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_z" />
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_r" />
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_t" />
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_d" />
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
+ android:keyLabel="l"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_l" />
@@ -91,13 +107,15 @@
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_v" />
-
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml
index c8e314acc..a4ed8ebc5 100644
--- a/java/res/xml-fr/kbd_qwerty_black.xml
+++ b/java/res/xml-fr/kbd_qwerty_black.xml
@@ -32,15 +32,21 @@
android:popupCharacters="@string/alternates_for_a"
android:keyEdgeFlags="left" />
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_z" />
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_r" />
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_t" />
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_d" />
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
+ android:keyLabel="l"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_l" />
@@ -91,13 +107,15 @@
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_v" />
-
+ android:keyWidth="15%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml
index 70c6a90b3..36cb8aa44 100644
--- a/java/res/xml-iw/kbd_qwerty_black.xml
+++ b/java/res/xml-iw/kbd_qwerty_black.xml
@@ -46,12 +46,12 @@
android:keyLabel="פ" />
+ android:keyWidth="13.75%p"
+ android:horizontalGap="1.25%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ android:keyLabel="p"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p" />
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
@@ -117,9 +127,9 @@
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml
index ffc94dcd8..990d7af38 100644
--- a/java/res/xml-nb/kbd_qwerty_black.xml
+++ b/java/res/xml-nb/kbd_qwerty_black.xml
@@ -34,10 +34,14 @@
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ android:keyLabel="p"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p" />
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
@@ -117,9 +127,9 @@
+ android:keyWidth="15%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
+ android:keyLabel="ц"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="2" />
+ android:keyLabel="у"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="3" />
+ android:keyLabel="к"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="4" />
+ android:keyLabel="н"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="6" />
+ android:keyLabel="г"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="7" />
+ android:keyLabel="ш"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="8" />
+ android:keyLabel="щ"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="9" />
+ android:keyLabel="з"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="0" />
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml
index e6f368995..711d0bed1 100644
--- a/java/res/xml-ru/kbd_qwerty_black.xml
+++ b/java/res/xml-ru/kbd_qwerty_black.xml
@@ -28,28 +28,46 @@
+ android:keyLabel="ц"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="2" />
+ android:keyLabel="у"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="3" />
+ android:keyLabel="к"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="4" />
+ android:keyLabel="н"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="6" />
+ android:keyLabel="г"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="7" />
+ android:keyLabel="ш"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="8" />
+ android:keyLabel="щ"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="9" />
+ android:keyLabel="з"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="0" />
+ android:keyWidth="11.75%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
+ android:keyLabel="њ"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="2" />
+ android:keyLabel="е"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="3" />
+ android:keyLabel="р"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="4" />
+ android:keyLabel="т"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="5" />
+ android:keyLabel="з"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="6" />
+ android:keyLabel="у"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="7" />
+ android:keyLabel="и"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="8" />
+ android:keyLabel="о"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="9" />
+ android:keyLabel="п"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="0" />
@@ -86,9 +106,9 @@
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
diff --git a/java/res/xml-sr/kbd_qwerty_black.xml b/java/res/xml-sr/kbd_qwerty_black.xml
index 74375e62d..a376e5fd5 100644
--- a/java/res/xml-sr/kbd_qwerty_black.xml
+++ b/java/res/xml-sr/kbd_qwerty_black.xml
@@ -29,25 +29,45 @@
+ android:keyLabel="њ"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="2" />
+ android:keyLabel="е"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="3" />
+ android:keyLabel="р"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="4" />
+ android:keyLabel="т"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="5" />
+ android:keyLabel="з"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="6" />
+ android:keyLabel="у"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="7" />
+ android:keyLabel="и"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="8" />
+ android:keyLabel="о"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="9" />
+ android:keyLabel="п"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="0" />
@@ -86,9 +106,9 @@
+ android:keyWidth="11.75%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ android:keyLabel="p"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p" />
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
+ android:keyWidth="15%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml
index 68caa3e37..f1f3653ea 100644
--- a/java/res/xml-sv/kbd_qwerty_black.xml
+++ b/java/res/xml-sv/kbd_qwerty_black.xml
@@ -36,10 +36,14 @@
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ android:keyLabel="p"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p" />
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
+ android:keyWidth="15%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
-
-
-
+ android:popupCharacters="@string/alternates_for_q"
+ android:keyEdgeFlags="left" />
+ android:popupCharacters="@string/alternates_for_p"
+ android:keyEdgeFlags="right" />
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_v" />
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml
index 6faa5189e..d40203d9d 100644
--- a/java/res/xml/kbd_qwerty_black.xml
+++ b/java/res/xml/kbd_qwerty_black.xml
@@ -28,9 +28,9 @@
+ android:popupCharacters="@string/alternates_for_q"
+ android:keyEdgeFlags="left" />
+ android:popupCharacters="@string/alternates_for_p"
+ android:keyEdgeFlags="right" />
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_v" />
+ android:keyWidth="15%p"
+ android:isRepeatable="true"
+ android:keyEdgeFlags="right" />
|