diff --git a/java/res/values-ar/donottranslate-more-keys.xml b/java/res/values-ar/donottranslate-more-keys.xml
index 39d38a5d9..36f670e00 100644
--- a/java/res/values-ar/donottranslate-more-keys.xml
+++ b/java/res/values-ar/donottranslate-more-keys.xml
@@ -20,18 +20,24 @@
+
+
+ \u0653: ARABIC MADDAH ABOVE
+ \u064f: ARABIC DAMMA -->
- "\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0651,\u0640\u0640\u0640|\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"
+
+ "\u060c,\u061b,\u061f,!,:,-,/,\',\",\u0640\u0640\u0640|\u0640,\u064e,\u0650,\u064b,\u064d,\u0670,\u0656,\u0655,\u0654,\u0653,\u0652,\u0651,\u064c,\u064f"
9
\u064b
"١"
@@ -44,16 +50,18 @@
"٨"
"٩"
"٠"
- 1,¹,½,⅓,¼,⅛
- 2,²,⅔
- 3,³,¾,⅜
- 4,⁴
- 5,⅝
+ 1
+ 2
+ 3
+ 4
+ 5
6
- 7,⅞
+ 7
8
9
- 0,ⁿ,∅
+
+ 0,\u066b,\u066c
\u060c
\u060c
\u061f
@@ -66,16 +74,33 @@
\\,,\@icon/3|\@integer/key_settings
\\,,\@icon/7|\@integer/key_tab
- \?,¿
+ \?
;
%,‰
- "،"
+
+ "\u060c"
"."
- "؟"
+ "\u061f"
"\u064b"
"\u061f,\u061b,!,:,-,/,\',\""
+
+
+
- "\u0651,\u0652,\u064c,\u0640\u0640\u0640|\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"
+ "\u0651,\u0652,\u064c,\u0653,\u064f,\u0650,\u064e,\u064b,\u0640\u0640\u0640|\u0640,\u064d,\u0654,\u0656,\u0655,\u0670"
♪
★
diff --git a/java/res/xml-sw600dp/kbd_rows_arabic.xml b/java/res/xml-sw600dp/kbd_rows_arabic.xml
index 275df50a5..c2d3cd4cc 100644
--- a/java/res/xml-sw600dp/kbd_rows_arabic.xml
+++ b/java/res/xml-sw600dp/kbd_rows_arabic.xml
@@ -26,30 +26,47 @@
+
+
+
+
+ latin:keyLabel="ق"
+ latin:moreKeys="ڨ" />
+
+ latin:moreKeys="\u06a4,\u06a2,\u06a5" />
+
+
-
+
+ latin:moreKeys="\ufeeb|\u0647\u200D" />
+
+
+
@@ -61,18 +78,28 @@
+
+
+
+ latin:keyLabel="ي"
+ latin:moreKeys="\u0626,\u0649" />
+
-
+ latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
+
+
+
+
+ latin:moreKeys="\u06af,\u06a9" />
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/res/xml-sw768dp/kbd_rows_arabic.xml b/java/res/xml-sw768dp/kbd_rows_arabic.xml
index 984ba5092..7ec36fd94 100644
--- a/java/res/xml-sw768dp/kbd_rows_arabic.xml
+++ b/java/res/xml-sw768dp/kbd_rows_arabic.xml
@@ -30,30 +30,47 @@
latin:keyStyle="tabKeyStyle"
latin:keyLabelOption="alignLeft"
latin:keyWidth="7.500%p" />
+
+
+
+
+ latin:keyLabel="ق"
+ latin:moreKeys="ڨ" />
+
+ latin:moreKeys="\u06a4,\u06a2,\u06a5" />
+
+
-
+
+ latin:moreKeys="\ufeeb|\u0647\u200D" />
+
+
+
@@ -69,17 +86,27 @@
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelOption="alignLeft"
latin:keyWidth="9.375%p" />
+
+ latin:keyLabel="ش"
+ latin:moreKeys="ڜ" />
+
+
+ latin:keyLabel="ي"
+ latin:moreKeys="\u0626,\u0649" />
+
-
+ latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/res/xml/kbd_rows_arabic.xml b/java/res/xml/kbd_rows_arabic.xml
index fba727110..dd5123e4c 100644
--- a/java/res/xml/kbd_rows_arabic.xml
+++ b/java/res/xml/kbd_rows_arabic.xml
@@ -26,69 +26,89 @@
+
+ latin:keyHintLabel="1"
+ latin:moreKeys="1,١" />
+
+ latin:keyHintLabel="2"
+ latin:moreKeys="2,٢" />
+
-
+ latin:keyHintLabel="3"
+ latin:moreKeys="3,٣,\u06a8" />
+
+ latin:keyHintLabel="4"
+ latin:moreKeys="4,٤,\u06a4,\u06a2,\u06a5" />
+
+ latin:keyHintLabel="5"
+ latin:moreKeys="5,٥" />
+
-
+ latin:keyHintLabel="7"
+ latin:moreKeys="7,٧,\ufeeb|\u0647\u200D" />
+
+ latin:keyHintLabel="8"
+ latin:moreKeys="8,٨" />
+
-
+ latin:keyHintLabel="9"
+ latin:moreKeys="9,٩" />
+
+
+ latin:keyLabel="ش"
+ latin:moreKeys="ڜ" />
+
-
+
-
+ latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
+
+
+
+
+
+
+
+
+
+
+
+