Use more standard Unicode notations in keyboard layout resource files.

bug: 5988656
Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a

11 files changed, 436 insertions, 432 deletions

diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml
index 7307a1a2b..01f7aee59 100644
--- a/java/res/xml/key_styles_number.xml
+++ b/java/res/xml/key_styles_number.xml
@@ -91,10 +91,11 @@
         latin:keyLabel="9"
         latin:keyHintLabel="WXYZ"
         latin:parentStyle="numberKeyStyle" />
+    <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
     <key-style
         latin:styleName="numStarKeyStyle"
         latin:code="42"
-        latin:keyLabel="\uff0a"
+        latin:keyLabel="&#xFF0A;"
         latin:parentStyle="numKeyStyle" />
     <!-- Only for non-tablet device -->
     <key-style
diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
index 78d5d0297..5cb6512f0 100644
--- a/java/res/xml/row_symbols_shift4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -32,19 +32,20 @@
                 <Key
                     latin:keyStyle="toAlphaKeyStyle"
                     latin:keyWidth="15%p" />
-                <!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
+                <!-- U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+                <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
                     <!-- latin:keyLabelFlags="hasPopupHint" -->
-                    <!-- latin:moreKeys="‟" -->
-                <!-- \u201e: "„" DOUBLE LOW-9 QUOTATION MARK -->
+                    <!-- latin:moreKeys="&#x201F;" -->
+                <!-- U+201E: "„" DOUBLE LOW-9 QUOTATION MARK -->
                 <Key
-                    latin:keyLabel="\u201e"
+                    latin:keyLabel="&#x201E;"
                     latin:backgroundType="functional" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="50%p" />
-                <!-- \u2026: "…" HORIZONTAL ELLIPSIS -->
+                <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
                 <Key
-                    latin:keyLabel="\u2026"
+                    latin:keyLabel="&#x2026;"
                     latin:backgroundType="functional" />
                 <Key
                     latin:keyStyle="enterKeyStyle"
@@ -57,20 +58,21 @@
                     latin:keyWidth="13.75%p" />
                 <include
                     latin:keyboardLayout="@xml/key_settings_or_tab" />
-                <!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
+                <!-- U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
+                <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
                     <!-- latin:keyLabelFlags="hasPopupHint" -->
-                    <!-- latin:moreKeys="‟" -->
-                <!-- \u201e: "„" DOUBLE LOW-9 QUOTATION MARK -->
+                    <!-- latin:moreKeys="&#x201F;" -->
+                <!-- U+201E: "„" DOUBLE LOW-9 QUOTATION MARK -->
                 <Key
-                    latin:keyLabel="\u201e"
+                    latin:keyLabel="&#x201E;"
                     latin:keyWidth="9.2%p"
                     latin:backgroundType="functional" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
                     latin:keyWidth="35.83%p" />
-                <!-- \u2026: "…" HORIZONTAL ELLIPSIS -->
+                <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
                 <Key
-                    latin:keyLabel="\u2026"
+                    latin:keyLabel="&#x2026;"
                     latin:keyWidth="9.2%p"
                     latin:backgroundType="functional" />
                 <Key
diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml
index 449b24041..84f7a3cb6 100644
--- a/java/res/xml/rows_arabic.xml
+++ b/java/res/xml/rows_arabic.xml
@@ -26,177 +26,177 @@
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u0636: "ض" ARABIC LETTER DAD
-             \u0661: "١" ARABIC-INDIC DIGIT ONE -->
+        <!-- U+0636: "ض" ARABIC LETTER DAD
+             U+0661: "١" ARABIC-INDIC DIGIT ONE -->
         <Key
-            latin:keyLabel="\u0636"
+            latin:keyLabel="&#x0636;"
             latin:keyHintLabel="1"
-            latin:additionalMoreKeys="1,\u0661" />
-        <!-- \u0635: "ص" ARABIC LETTER SAD
-             \u0662: "٢" ARABIC-INDIC DIGIT TWO -->
+            latin:additionalMoreKeys="1,&#x0661;" />
+        <!-- U+0635: "ص" ARABIC LETTER SAD
+             U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
         <Key
-            latin:keyLabel="\u0635"
+            latin:keyLabel="&#x0635;"
             latin:keyHintLabel="2"
-            latin:additionalMoreKeys="2,\u0662" />
-        <!-- \u0642: "ق" ARABIC LETTER QAF
-             \u06a8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE
-             \u0663: "٣" ARABIC-INDIC DIGIT THREE -->
-        <!-- TODO: DroidSansArabic lacks the glyph of \u06a8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+            latin:additionalMoreKeys="2,&#x0662;" />
+        <!-- U+0642: "ق" ARABIC LETTER QAF
+             U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE
+             U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
         <Key
-            latin:keyLabel="\u0642"
+            latin:keyLabel="&#x0642;"
             latin:keyHintLabel="3"
-            latin:additionalMoreKeys="3,\u0663"
-            latin:moreKeys="\u06a8" />
-        <!-- \u0641: "ف" ARABIC LETTER FEH
-             \u06a4: "ڤ" ARABIC LETTER VEH
-             \u06a2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
-             \u06a5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW
-             \u0664: "٤" ARABIC-INDIC DIGIT FOUR -->
-        <!-- TODO: DroidSansArabic lacks the glyph of \u06a2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
-        <!-- TODO: DroidSansArabic lacks the glyph of \u06a5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
-        <Key
-            latin:keyLabel="\u0641"
+            latin:additionalMoreKeys="3,&#x0663;"
+            latin:moreKeys="&#x06A8;" />
+        <!-- U+0641: "ف" ARABIC LETTER FEH
+             U+06A4: "ڤ" ARABIC LETTER VEH
+             U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
+             U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW
+             U+0664: "٤" ARABIC-INDIC DIGIT FOUR -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+        <Key
+            latin:keyLabel="&#x0641;"
             latin:keyHintLabel="4"
-            latin:additionalMoreKeys="4,\u0664"
-            latin:moreKeys="\u06a4,\u06a2,\u06a5" />
-        <!-- \u063a: "غ" ARABIC LETTER GHAIN
-             \u0665: "٥" ARABIC-INDIC DIGIT FIVE -->
+            latin:additionalMoreKeys="4,&#x0664;"
+            latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;" />
+        <!-- U+063A: "غ" ARABIC LETTER GHAIN
+             U+0665: "٥" ARABIC-INDIC DIGIT FIVE -->
         <Key
-            latin:keyLabel="\u063a"
+            latin:keyLabel="&#x063A;"
             latin:keyHintLabel="5"
-            latin:additionalMoreKeys="5,\u0665" />
-        <!-- \u0639: "ع" ARABIC LETTER AIN
-             \u0666: "٦" ARABIC-INDIC DIGIT SIX -->
+            latin:additionalMoreKeys="5,&#x0665;" />
+        <!-- U+0639: "ع" ARABIC LETTER AIN
+             U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
         <Key
-            latin:keyLabel="\u0639"
+            latin:keyLabel="&#x0639;"
             latin:keyHintLabel="6"
-            latin:additionalMoreKeys="6,\u0666" />
-        <!-- \u0647: "ه" ARABIC LETTER HEH
-             \ufeeb: "ﻫ" ARABIC LETTER HEH INITIAL FORM
-             \u0647\u200d: ARABIC LETTER HEH + ZERO WIDTH JOINER
-             \u0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
+            latin:additionalMoreKeys="6,&#x0666;" />
+        <!-- U+0647: "ه" ARABIC LETTER HEH
+             U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+             U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
+             U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
         <Key
-            latin:keyLabel="\u0647"
+            latin:keyLabel="&#x0647;"
             latin:keyHintLabel="7"
-            latin:additionalMoreKeys="7,\u0667"
-            latin:moreKeys="\ufeeb|\u0647\u200d" />
-        <!-- \u062e: "خ" ARABIC LETTER KHAH
-             \u0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
+            latin:additionalMoreKeys="7,&#x0667;"
+            latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;" />
+        <!-- U+062E: "خ" ARABIC LETTER KHAH
+             U+0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
         <Key
-            latin:keyLabel="\u062e"
+            latin:keyLabel="&#x062E;"
             latin:keyHintLabel="8"
-            latin:additionalMoreKeys="8,\u0668" />
-        <!-- \u062d: "ح" ARABIC LETTER HAH
-             \u0669: "٩" ARABIC-INDIC DIGIT NINE -->
+            latin:additionalMoreKeys="8,&#x0668;" />
+        <!-- U+062D: "ح" ARABIC LETTER HAH
+             U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
         <Key
-            latin:keyLabel="\u062d"
+            latin:keyLabel="&#x062D;"
             latin:keyHintLabel="9"
-            latin:additionalMoreKeys="9,\u0669" />
-        <!-- \u062c: "ج" ARABIC LETTER JEEM
-             \u0686: "چ" ARABIC LETTER TCHEH
-             \u0660: "٠" ARABIC-INDIC DIGIT ZERO -->
+            latin:additionalMoreKeys="9,&#x0669;" />
+        <!-- U+062C: "ج" ARABIC LETTER JEEM
+             U+0686: "چ" ARABIC LETTER TCHEH
+             U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
         <Key
-            latin:keyLabel="\u062c"
+            latin:keyLabel="&#x062C;"
             latin:keyHintLabel="0"
-            latin:additionalMoreKeys="0,\u0660"
-            latin:moreKeys="\u0686"
+            latin:additionalMoreKeys="0,&#x0660;"
+            latin:moreKeys="&#x0686;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u0634: "ش" ARABIC LETTER SHEEN
-             \u069c: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
-        <!-- TODO: DroidSansArabic lacks the glyph of \u069c ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
-        <Key
-            latin:keyLabel="\u0634"
-            latin:moreKeys="\u069c" />
-        <!-- \u0633: "س" ARABIC LETTER SEEN -->
-        <Key
-            latin:keyLabel="\u0633" />
-        <!-- \u064a: "ي" ARABIC LETTER YEH
-             \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
-             \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
-        <Key
-            latin:keyLabel="\u064a"
-            latin:moreKeys="\u0626,\u0649" />
-        <!-- \u0628: "ب" ARABIC LETTER BEH
-             \u067e: "پ" ARABIC LETTER PEH -->
-        <Key
-            latin:keyLabel="\u0628"
-            latin:moreKeys="\u067e" />
-        <!-- \u0644: "ل" ARABIC LETTER LAM
-             \ufefb: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
-             \u0627: "ا" ARABIC LETTER ALEF
-             \ufef7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
-             \u0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
-             \ufef9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
-             \u0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
-             \ufef5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
-             \u0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
-        <Key
-            latin:keyLabel="\u0644"
-            latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
-        <!-- \u0627: "ا" ARABIC LETTER ALEF
-             \u0621: "ء" ARABIC LETTER HAMZA
-             \u0671: "ٱ" ARABIC LETTER ALEF WASLA
-             \u0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
-             \u0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
-             \u0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
-        <Key
-            latin:keyLabel="\u0627"
-            latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
-        <!-- \u062a: "ت" ARABIC LETTER TEH
-             \u062b: "ﺙ" ARABIC LETTER THEH -->
-        <Key
-            latin:keyLabel="\u062a"
-            latin:moreKeys="\u062b" />
-        <!-- \u0646: "ن" ARABIC LETTER NOON -->
-        <Key
-            latin:keyLabel="\u0646" />
-        <!-- \u0645: "م" ARABIC LETTER MEEM -->
-        <Key
-            latin:keyLabel="\u0645" />
-        <!-- \u0643: "ك" ARABIC LETTER KAF
-             \u06af: "گ" ARABIC LETTER GAF
-             \u06a9: "ک" ARABIC LETTER KEHEH -->
-        <Key
-            latin:keyLabel="\u0643"
-            latin:moreKeys="\u06af,\u06a9"
+        <!-- U+0634: "ش" ARABIC LETTER SHEEN
+             U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+        <Key
+            latin:keyLabel="&#x0634;"
+            latin:moreKeys="&#x069C;" />
+        <!-- U+0633: "س" ARABIC LETTER SEEN -->
+        <Key
+            latin:keyLabel="&#x0633;" />
+        <!-- U+064A: "ي" ARABIC LETTER YEH
+             U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+             U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+        <Key
+            latin:keyLabel="&#x064A;"
+            latin:moreKeys="&#x0626;,&#x0649;" />
+        <!-- U+0628: "ب" ARABIC LETTER BEH
+             U+067E: "پ" ARABIC LETTER PEH -->
+        <Key
+            latin:keyLabel="&#x0628;"
+            latin:moreKeys="&#x067E;" />
+        <!-- U+0644: "ل" ARABIC LETTER LAM
+             U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+             U+0627: "ا" ARABIC LETTER ALEF
+             U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+             U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+             U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+             U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+             U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+        <Key
+            latin:keyLabel="&#x0644;"
+            latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;" />
+        <!-- U+0627: "ا" ARABIC LETTER ALEF
+             U+0621: "ء" ARABIC LETTER HAMZA
+             U+0671: "ٱ" ARABIC LETTER ALEF WASLA
+             U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+             U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+             U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+        <Key
+            latin:keyLabel="&#x0627;"
+            latin:moreKeys="&#x0621;,&#x0671;,&#x0623;,&#x0625;,&#x0622;" />
+        <!-- U+062A: "ت" ARABIC LETTER TEH
+             U+062B: "ﺙ" ARABIC LETTER THEH -->
+        <Key
+            latin:keyLabel="&#x062A;"
+            latin:moreKeys="&#x062B;" />
+        <!-- U+0646: "ن" ARABIC LETTER NOON -->
+        <Key
+            latin:keyLabel="&#x0646;" />
+        <!-- U+0645: "م" ARABIC LETTER MEEM -->
+        <Key
+            latin:keyLabel="&#x0645;" />
+        <!-- U+0643: "ك" ARABIC LETTER KAF
+             U+06AF: "گ" ARABIC LETTER GAF
+             U+06A9: "ک" ARABIC LETTER KEHEH -->
+        <Key
+            latin:keyLabel="&#x0643;"
+            latin:moreKeys="&#x06AF;,&#x06A9;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u0638: "ظ" ARABIC LETTER ZAH -->
+        <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
         <Key
-            latin:keyLabel="\u0638"
+            latin:keyLabel="&#x0638;"
             latin:keyXPos="5.0%p" />
-        <!-- \u0637: "ط" ARABIC LETTER TAH -->
+        <!-- U+0637: "ط" ARABIC LETTER TAH -->
         <Key
-            latin:keyLabel="\u0637" />
-        <!-- \u0630: "ذ" ARABIC LETTER THAL -->
+            latin:keyLabel="&#x0637;" />
+        <!-- U+0630: "ذ" ARABIC LETTER THAL -->
         <Key
-            latin:keyLabel="\u0630" />
-        <!-- \u062f: "د" ARABIC LETTER DAL -->
+            latin:keyLabel="&#x0630;" />
+        <!-- U+062F: "د" ARABIC LETTER DAL -->
         <Key
-            latin:keyLabel="\u062f" />
-        <!-- \u0632: "ز" ARABIC LETTER ZAIN
-             \u0698: "ژ" ARABIC LETTER JEH -->
+            latin:keyLabel="&#x062F;" />
+        <!-- U+0632: "ز" ARABIC LETTER ZAIN
+             U+0698: "ژ" ARABIC LETTER JEH -->
         <Key
-            latin:keyLabel="\u0632"
-            latin:moreKeys="\u0698" />
-        <!-- \u0631: "ر" ARABIC LETTER REH -->
+            latin:keyLabel="&#x0632;"
+            latin:moreKeys="&#x0698;" />
+        <!-- U+0631: "ر" ARABIC LETTER REH -->
         <Key
-            latin:keyLabel="\u0631" />
-        <!-- \u0629: "ة" ARABIC LETTER TEH MARBUTA -->
+            latin:keyLabel="&#x0631;" />
+        <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
         <Key
-            latin:keyLabel="\u0629" />
-        <!-- \u0648: "و" ARABIC LETTER WAW
-             \u0624: "ﺅ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
+            latin:keyLabel="&#x0629;" />
+        <!-- U+0648: "و" ARABIC LETTER WAW
+             U+0624: "ﺅ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
         <Key
-            latin:keyLabel="\u0648"
-            latin:moreKeys="\u0624" />
+            latin:keyLabel="&#x0648;"
+            latin:moreKeys="&#x0624;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
diff --git a/java/res/xml/rows_azerty.xml b/java/res/xml/rows_azerty.xml
index 533c683d6..6f607cbe1 100644
--- a/java/res/xml/rows_azerty.xml
+++ b/java/res/xml/rows_azerty.xml
@@ -136,7 +136,7 @@
              order of "4,3,1,2". See @string/more_keys_for_single_quote -->
         <Key
             latin:keyLabel="\'"
-            latin:moreKeys="\u2018,\u2019,\u201b,\u201a" />
+            latin:moreKeys="&#x2018;,&#x2019;,&#x201B;,&#x201A;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
diff --git a/java/res/xml/rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml
index 3a8da0485..3d954a900 100644
--- a/java/res/xml/rows_bulgarian.xml
+++ b/java/res/xml/rows_bulgarian.xml
@@ -26,99 +26,99 @@
     <Row
         latin:keyWidth="9.091%p"
     >
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447"
+            latin:keyLabel="&#x0447;"
             latin:keyHintLabel="1"
             latin:additionalMoreKeys="1" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448"
+            latin:keyLabel="&#x0448;"
             latin:keyHintLabel="2"
             latin:additionalMoreKeys="2" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435"
+            latin:keyLabel="&#x0435;"
             latin:keyHintLabel="3"
             latin:additionalMoreKeys="3" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440"
+            latin:keyLabel="&#x0440;"
             latin:keyHintLabel="4"
             latin:additionalMoreKeys="4" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442"
+            latin:keyLabel="&#x0442;"
             latin:keyHintLabel="5"
             latin:additionalMoreKeys="5" />
-        <!-- \u044a: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
+        <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
         <Key
-            latin:keyLabel="\u044a"
+            latin:keyLabel="&#x044A;"
             latin:keyHintLabel="6"
             latin:additionalMoreKeys="6" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443"
+            latin:keyLabel="&#x0443;"
             latin:keyHintLabel="7"
             latin:additionalMoreKeys="7" />
-        <!-- \u0438: "и" CYRILLIC SMALL LETTER I
-             \u045d: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
+        <!-- U+0438: "и" CYRILLIC SMALL LETTER I
+             U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
         <Key
-            latin:keyLabel="\u0438"
+            latin:keyLabel="&#x0438;"
             latin:keyHintLabel="8"
             latin:additionalMoreKeys="8"
-            latin:moreKeys="\u045d" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+            latin:moreKeys="&#x045D;" />
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e"
+            latin:keyLabel="&#x043E;"
             latin:keyHintLabel="9"
             latin:additionalMoreKeys="9" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f"
+            latin:keyLabel="&#x043F;"
             latin:keyHintLabel="0"
             latin:additionalMoreKeys="0" />
-        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="\u044f"
+            latin:keyLabel="&#x044F;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
             latin:keyWidth="9.091%p"
     >
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+            latin:keyLabel="&#x0430;" />
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+            latin:keyLabel="&#x0444;" />
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+            latin:keyLabel="&#x0433;" />
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445" />
-        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+            latin:keyLabel="&#x0445;" />
+        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="\u0439" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+            latin:keyLabel="&#x0439;" />
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+            latin:keyLabel="&#x043A;" />
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA -->
         <Key
-            latin:keyLabel="\u0449" />
-        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+            latin:keyLabel="&#x0449;" />
+        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="\u044c"
+            latin:keyLabel="&#x044C;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -127,30 +127,30 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="13.636%p" />
-        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0437;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+            latin:keyLabel="&#x0436;" />
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446" />
-        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+            latin:keyLabel="&#x0446;" />
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x043D;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
-        <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+            latin:keyLabel="&#x043C;" />
+        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="\u044e" />
+            latin:keyLabel="&#x044E;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_hebrew.xml b/java/res/xml/rows_hebrew.xml
index ca18a0c23..1f11632f5 100644
--- a/java/res/xml/rows_hebrew.xml
+++ b/java/res/xml/rows_hebrew.xml
@@ -26,31 +26,31 @@
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u05e7: "ק" HEBREW LETTER QOF -->
+        <!-- U+05E7: "ק" HEBREW LETTER QOF -->
         <Key
-            latin:keyLabel="\u05e7"
+            latin:keyLabel="&#x05E7;"
             latin:keyXPos="5%p" />
-        <!-- \u05e8: "ר" HEBREW LETTER RESH -->
+        <!-- U+05E8: "ר" HEBREW LETTER RESH -->
         <Key
-            latin:keyLabel="\u05e8" />
-        <!-- \u05d0: "א" HEBREW LETTER ALEF -->
+            latin:keyLabel="&#x05E8;" />
+        <!-- U+05D0: "א" HEBREW LETTER ALEF -->
         <Key
-            latin:keyLabel="\u05d0" />
-        <!-- \u05d8: "ט" HEBREW LETTER TET -->
+            latin:keyLabel="&#x05D0;" />
+        <!-- U+05D8: "ט" HEBREW LETTER TET -->
         <Key
-            latin:keyLabel="\u05d8" />
-        <!-- \u05d5: "ו" HEBREW LETTER VAV -->
+            latin:keyLabel="&#x05D8;" />
+        <!-- U+05D5: "ו" HEBREW LETTER VAV -->
         <Key
-            latin:keyLabel="\u05d5" />
-        <!-- \u05df: "ן" HEBREW LETTER FINAL NUN -->
+            latin:keyLabel="&#x05D5;" />
+        <!-- U+05DF: "ן" HEBREW LETTER FINAL NUN -->
         <Key
-            latin:keyLabel="\u05df" />
-        <!-- \u05dd: "ם" HEBREW LETTER FINAL MEM -->
+            latin:keyLabel="&#x05DF;" />
+        <!-- U+05DD: "ם" HEBREW LETTER FINAL MEM -->
         <Key
-            latin:keyLabel="\u05dd" />
-        <!-- \u05e4: "פ" HEBREW LETTER PE -->
+            latin:keyLabel="&#x05DD;" />
+        <!-- U+05E4: "פ" HEBREW LETTER PE -->
         <Key
-            latin:keyLabel="\u05e4" />
+            latin:keyLabel="&#x05E4;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
@@ -59,83 +59,83 @@
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u05e9: "ש" HEBREW LETTER SHIN -->
+        <!-- U+05E9: "ש" HEBREW LETTER SHIN -->
         <Key
-            latin:keyLabel="\u05e9" />
-        <!-- \u05d3: "ד" HEBREW LETTER DALET -->
+            latin:keyLabel="&#x05E9;" />
+        <!-- U+05D3: "ד" HEBREW LETTER DALET -->
         <Key
-            latin:keyLabel="\u05d3" />
-        <!-- \u05d2: "ג" HEBREW LETTER GIMEL
-             \u05d2\u05f3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
+            latin:keyLabel="&#x05D3;" />
+        <!-- U+05D2: "ג" HEBREW LETTER GIMEL
+             U+05D2 U+05F3: "ג׳" HEBREW LETTER GIMEL + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d2"
-            latin:moreKeys="\u05d2\u05f3" />
-        <!-- \u05db: "כ" HEBREW LETTER KAF -->
+            latin:keyLabel="&#x05D2;"
+            latin:moreKeys="&#x05D2;&#x05F3;" />
+        <!-- U+05DB: "כ" HEBREW LETTER KAF -->
         <Key
-            latin:keyLabel="\u05db" />
-        <!-- \u05e2: "ע" HEBREW LETTER AYIN -->
+            latin:keyLabel="&#x05DB;" />
+        <!-- U+05E2: "ע" HEBREW LETTER AYIN -->
         <Key
-            latin:keyLabel="\u05e2" />
-        <!-- \u05d9: "י" HEBREW LETTER YOD
-             \u05f2\u05b7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
+            latin:keyLabel="&#x05E2;" />
+        <!-- U+05D9: "י" HEBREW LETTER YOD
+             U+05F2 U+05B7: "ײַ" HEBREW LIGATURE YIDDISH DOUBLE YOD + HEBREW POINT PATAH -->
         <Key
-            latin:keyLabel="\u05d9"
-            latin:moreKeys="\u05f2\u05b7" />
-        <!-- \u05d7: "ח" HEBREW LETTER HET
-             \u05d7\u05f3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
+            latin:keyLabel="&#x05D9;"
+            latin:moreKeys="&#x05F2;&#x05B7;" />
+        <!-- U+05D7: "ח" HEBREW LETTER HET
+             U+05D7 U+05F3: "ח׳" HEBREW LETTER HET + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d7"
-            latin:moreKeys="\u05d7\u05f3" />
-        <!-- \u05dc: "ל" HEBREW LETTER LAMED -->
+            latin:keyLabel="&#x05D7;"
+            latin:moreKeys="&#x05D7;&#x05F3;" />
+        <!-- U+05DC: "ל" HEBREW LETTER LAMED -->
         <Key
-            latin:keyLabel="\u05dc" />
-        <!-- \u05da: "ך" HEBREW LETTER FINAL KAF -->
+            latin:keyLabel="&#x05DC;" />
+        <!-- U+05DA: "ך" HEBREW LETTER FINAL KAF -->
         <Key
-            latin:keyLabel="\u05da" />
-        <!-- \u05e3: "ף" HEBREW LETTER FINAL PE -->
+            latin:keyLabel="&#x05DA;" />
+        <!-- U+05E3: "ף" HEBREW LETTER FINAL PE -->
         <Key
-            latin:keyLabel="\u05e3"
+            latin:keyLabel="&#x05E3;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="10%p"
     >
-        <!-- \u05d6: "ז" HEBREW LETTER ZAYIN
-             \u05d6\u05f3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
+        <!-- U+05D6: "ז" HEBREW LETTER ZAYIN
+             U+05D6 U+05F3: "ז׳" HEBREW LETTER ZAYIN + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05d6"
-            latin:moreKeys="\u05d6\u05f3"
+            latin:keyLabel="&#x05D6;"
+            latin:moreKeys="&#x05D6;&#x05F3;"
             latin:keyXPos="5%p" />
-        <!-- \u05e1: "ס" HEBREW LETTER SAMEKH -->
+        <!-- U+05E1: "ס" HEBREW LETTER SAMEKH -->
         <Key
-            latin:keyLabel="\u05e1" />
-        <!-- \u05d1: "ב" HEBREW LETTER BET -->
+            latin:keyLabel="&#x05E1;" />
+        <!-- U+05D1: "ב" HEBREW LETTER BET -->
         <Key
-            latin:keyLabel="\u05d1" />
-        <!-- \u05d4: "ה" HEBREW LETTER HE -->
+            latin:keyLabel="&#x05D1;" />
+        <!-- U+05D4: "ה" HEBREW LETTER HE -->
         <Key
-            latin:keyLabel="\u05d4" />
-        <!-- \u05e0: "נ" HEBREW LETTER NUN -->
+            latin:keyLabel="&#x05D4;" />
+        <!-- U+05E0: "נ" HEBREW LETTER NUN -->
         <Key
-            latin:keyLabel="\u05e0" />
-        <!-- \u05de: "מ" HEBREW LETTER MEM -->
+            latin:keyLabel="&#x05E0;" />
+        <!-- U+05DE: "מ" HEBREW LETTER MEM -->
         <Key
-            latin:keyLabel="\u05de" />
-        <!-- \u05e6: "צ" HEBREW LETTER TSADI
-             \u05e6\u05f3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
+            latin:keyLabel="&#x05DE;" />
+        <!-- U+05E6: "צ" HEBREW LETTER TSADI
+             U+05E6 U+05F3: "צ׳" HEBREW LETTER TSADI + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05e6"
-            latin:moreKeys="\u05e6\u05f3" />
-        <!-- \u05ea: "ת" HEBREW LETTER TAV
-             \u05ea\u05f3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
+            latin:keyLabel="&#x05E6;"
+            latin:moreKeys="&#x05E6;&#x05F3;" />
+        <!-- U+05EA: "ת" HEBREW LETTER TAV
+             U+05EA U+05F3: "ת׳" HEBREW LETTER TAV + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05ea"
-            latin:moreKeys="\u05ea\u05f3" />
-        <!-- \u05e5: "ץ" HEBREW LETTER FINAL TSADI
-             \u05e5\u05f3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
+            latin:keyLabel="&#x05EA;"
+            latin:moreKeys="&#x05EA;&#x05F3;" />
+        <!-- U+05E5: "ץ" HEBREW LETTER FINAL TSADI
+             U+05E5 U+05F3: "ץ׳" HEBREW LETTER FINAL TSADI + HEBREW PUNCTUATION GERESH -->
         <Key
-            latin:keyLabel="\u05e5"
-            latin:moreKeys="\u05e5\u05f3" />
+            latin:keyLabel="&#x05E5;"
+            latin:moreKeys="&#x05E5;&#x05F3;" />
         <!-- Here is 5%p space -->
     </Row>
     <include
diff --git a/java/res/xml/rows_serbian.xml b/java/res/xml/rows_serbian.xml
index 5591ced36..cf52fe0cc 100644
--- a/java/res/xml/rows_serbian.xml
+++ b/java/res/xml/rows_serbian.xml
@@ -26,97 +26,97 @@
     <Row
         latin:keyWidth="9.091%p"
     >
-        <!-- \u0459: "љ" CYRILLIC SMALL LETTER LJE -->
+        <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->
         <Key
-            latin:keyLabel="\u0459"
+            latin:keyLabel="&#x0459;"
             latin:keyHintLabel="1"
             latin:additionalMoreKeys="1" />
-        <!-- \u045a: "њ" CYRILLIC SMALL LETTER NJE -->
+        <!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->
         <Key
-            latin:keyLabel="\u045a"
+            latin:keyLabel="&#x045A;"
             latin:keyHintLabel="2"
             latin:additionalMoreKeys="2" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435"
+            latin:keyLabel="&#x0435;"
             latin:keyHintLabel="3"
             latin:additionalMoreKeys="3" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440"
+            latin:keyLabel="&#x0440;"
             latin:keyHintLabel="4"
             latin:additionalMoreKeys="4" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442"
+            latin:keyLabel="&#x0442;"
             latin:keyHintLabel="5"
             latin:additionalMoreKeys="5" />
-        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437"
+            latin:keyLabel="&#x0437;"
             latin:keyHintLabel="6"
             latin:additionalMoreKeys="6" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443"
+            latin:keyLabel="&#x0443;"
             latin:keyHintLabel="7"
             latin:additionalMoreKeys="7" />
-        <!-- \u0438: "и" CYRILLIC SMALL LETTER I -->
+        <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->
         <Key
-            latin:keyLabel="\u0438"
+            latin:keyLabel="&#x0438;"
             latin:keyHintLabel="8"
             latin:additionalMoreKeys="8" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e"
+            latin:keyLabel="&#x043E;"
             latin:keyHintLabel="9"
             latin:additionalMoreKeys="9" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f"
+            latin:keyLabel="&#x043F;"
             latin:keyHintLabel="0"
             latin:additionalMoreKeys="0" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448"
+            latin:keyLabel="&#x0448;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="9.091%p"
     >
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+            latin:keyLabel="&#x0430;" />
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+            latin:keyLabel="&#x0444;" />
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+            latin:keyLabel="&#x0433;" />
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445" />
-        <!-- \u0458: "ј" CYRILLIC SMALL LETTER JE -->
+            latin:keyLabel="&#x0445;" />
+        <!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->
         <Key
-            latin:keyLabel="\u0458" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+            latin:keyLabel="&#x0458;" />
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+            latin:keyLabel="&#x043A;" />
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447" />
-        <!-- \u045b: "ћ" CYRILLIC SMALL LETTER TSHE -->
+            latin:keyLabel="&#x0447;" />
+        <!-- U+045B: "ћ" CYRILLIC SMALL LETTER TSHE -->
         <Key
-            latin:keyLabel="\u045b"
+            latin:keyLabel="&#x045B;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -125,33 +125,33 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="11.75%p" />
-        <!-- \u0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
+        <!-- U+0455: "ѕ" CYRILLIC SMALL LETTER DZE -->
         <Key
-            latin:keyLabel="\u0455" />
-        <!-- \u045f: "џ" CYRILLIC SMALL LETTER DZHE -->
+            latin:keyLabel="&#x0455;" />
+        <!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->
         <Key
-            latin:keyLabel="\u045f" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+            latin:keyLabel="&#x045F;" />
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446" />
-        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+            latin:keyLabel="&#x0446;" />
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x043D;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
-        <!-- \u0452: "ђ" CYRILLIC SMALL LETTER DJE -->
+            latin:keyLabel="&#x043C;" />
+        <!-- U+0452: "ђ" CYRILLIC SMALL LETTER DJE -->
         <Key
-            latin:keyLabel="\u0452" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0452;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436" />
+            latin:keyLabel="&#x0436;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_slavic.xml b/java/res/xml/rows_slavic.xml
index 4472f8efd..4099edd3f 100644
--- a/java/res/xml/rows_slavic.xml
+++ b/java/res/xml/rows_slavic.xml
@@ -26,101 +26,101 @@
     <Row
         latin:keyWidth="9.091%p"
     >
-        <!-- \u0439: "й" CYRILLIC SMALL LETTER SHORT I -->
+        <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->
         <Key
-            latin:keyLabel="\u0439"
+            latin:keyLabel="&#x0439;"
             latin:keyHintLabel="1"
             latin:additionalMoreKeys="1" />
-        <!-- \u0446: "ц" CYRILLIC SMALL LETTER TSE -->
+        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->
         <Key
-            latin:keyLabel="\u0446"
+            latin:keyLabel="&#x0446;"
             latin:keyHintLabel="2"
             latin:additionalMoreKeys="2" />
-        <!-- \u0443: "у" CYRILLIC SMALL LETTER U -->
+        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->
         <Key
-            latin:keyLabel="\u0443"
+            latin:keyLabel="&#x0443;"
             latin:keyHintLabel="3"
             latin:additionalMoreKeys="3"
             latin:moreKeys="@string/more_keys_for_slavic_u" />
-        <!-- \u043a: "к" CYRILLIC SMALL LETTER KA -->
+        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->
         <Key
-            latin:keyLabel="\u043a"
+            latin:keyLabel="&#x043A;"
             latin:keyHintLabel="4"
             latin:additionalMoreKeys="4" />
-        <!-- \u0435: "е" CYRILLIC SMALL LETTER IE -->
+        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->
         <Key
-            latin:keyLabel="\u0435"
+            latin:keyLabel="&#x0435;"
             latin:keyHintLabel="5"
             latin:additionalMoreKeys="5"
             latin:moreKeys="@string/more_keys_for_slavic_ye" />
-        <!-- \u043d: "н" CYRILLIC SMALL LETTER EN -->
+        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->
         <Key
-            latin:keyLabel="\u043d"
+            latin:keyLabel="&#x043D;"
             latin:keyHintLabel="6"
             latin:additionalMoreKeys="6"
             latin:moreKeys="@string/more_keys_for_slavic_en" />
-        <!-- \u0433: "г" CYRILLIC SMALL LETTER GHE -->
+        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->
         <Key
-            latin:keyLabel="\u0433"
+            latin:keyLabel="&#x0433;"
             latin:keyHintLabel="7"
             latin:additionalMoreKeys="7" />
-        <!-- \u0448: "ш" CYRILLIC SMALL LETTER SHA -->
+        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->
         <Key
-            latin:keyLabel="\u0448"
+            latin:keyLabel="&#x0448;"
             latin:keyHintLabel="8"
             latin:additionalMoreKeys="8" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_shcha"
             latin:keyHintLabel="9"
             latin:additionalMoreKeys="9" />
-        <!-- \u0437: "з" CYRILLIC SMALL LETTER ZE -->
+        <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
         <Key
-            latin:keyLabel="\u0437"
+            latin:keyLabel="&#x0437;"
             latin:keyHintLabel="0"
             latin:additionalMoreKeys="0" />
-        <!-- \u0445: "х" CYRILLIC SMALL LETTER HA -->
+        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->
         <Key
-            latin:keyLabel="\u0445"
+            latin:keyLabel="&#x0445;"
             latin:moreKeys="@string/more_keys_for_slavic_ha"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
             latin:keyWidth="9.091%p"
     >
-        <!-- \u0444: "ф" CYRILLIC SMALL LETTER EF -->
+        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
         <Key
-            latin:keyLabel="\u0444" />
+            latin:keyLabel="&#x0444;" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_yery"
             latin:moreKeys="@string/more_keys_for_slavic_yery" />
-        <!-- \u0432: "в" CYRILLIC SMALL LETTER VE -->
+        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
         <Key
-            latin:keyLabel="\u0432" />
-        <!-- \u0430: "а" CYRILLIC SMALL LETTER A -->
+            latin:keyLabel="&#x0432;" />
+        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
         <Key
-            latin:keyLabel="\u0430" />
-        <!-- \u043f: "п" CYRILLIC SMALL LETTER PE -->
+            latin:keyLabel="&#x0430;" />
+        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->
         <Key
-            latin:keyLabel="\u043f" />
-        <!-- \u0440: "р" CYRILLIC SMALL LETTER ER -->
+            latin:keyLabel="&#x043F;" />
+        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->
         <Key
-            latin:keyLabel="\u0440" />
-        <!-- \u043e: "о" CYRILLIC SMALL LETTER O -->
+            latin:keyLabel="&#x0440;" />
+        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->
         <Key
-            latin:keyLabel="\u043e"
+            latin:keyLabel="&#x043E;"
             latin:moreKeys="@string/more_keys_for_slavic_o" />
-        <!-- \u043b: "л" CYRILLIC SMALL LETTER EL -->
+        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->
         <Key
-            latin:keyLabel="\u043b" />
-        <!-- \u0434: "д" CYRILLIC SMALL LETTER DE -->
+            latin:keyLabel="&#x043B;" />
+        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->
         <Key
-            latin:keyLabel="\u0434" />
-        <!-- \u0436: "ж" CYRILLIC SMALL LETTER ZHE -->
+            latin:keyLabel="&#x0434;" />
+        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->
         <Key
-            latin:keyLabel="\u0436" />
-        <!-- \u044d: "э" CYRILLIC SMALL LETTER E -->
+            latin:keyLabel="&#x0436;" />
+        <!-- U+044D: "э" CYRILLIC SMALL LETTER E -->
         <Key
-            latin:keyLabel="\u044d"
+            latin:keyLabel="&#x044D;"
             latin:keyWidth="fillRight" />
     </Row>
     <Row
@@ -129,33 +129,33 @@
         <Key
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="11.75%p" />
-        <!-- \u044f: "я" CYRILLIC SMALL LETTER YA -->
+        <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->
         <Key
-            latin:keyLabel="\u044f" />
-        <!-- \u0447: "ч" CYRILLIC SMALL LETTER CHE -->
+            latin:keyLabel="&#x044F;" />
+        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->
         <Key
-            latin:keyLabel="\u0447" />
-        <!-- \u0441: "с" CYRILLIC SMALL LETTER ES -->
+            latin:keyLabel="&#x0447;" />
+        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->
         <Key
-            latin:keyLabel="\u0441" />
-        <!-- \u043c: "м" CYRILLIC SMALL LETTER EM -->
+            latin:keyLabel="&#x0441;" />
+        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
         <Key
-            latin:keyLabel="\u043c" />
+            latin:keyLabel="&#x043C;" />
         <Key
             latin:keyLabel="@string/keylabel_for_slavic_i" />
-        <!-- \u0442: "т" CYRILLIC SMALL LETTER TE -->
+        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->
         <Key
-            latin:keyLabel="\u0442" />
-        <!-- \u044c: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
+            latin:keyLabel="&#x0442;" />
+        <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN -->
         <Key
-            latin:keyLabel="\u044c"
+            latin:keyLabel="&#x044C;"
             latin:moreKeys="@string/more_keys_for_slavic_soft_sign" />
-        <!-- \u0431: "б" CYRILLIC SMALL LETTER BE -->
+        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->
         <Key
-            latin:keyLabel="\u0431" />
-        <!-- \u044e: "ю" CYRILLIC SMALL LETTER YU -->
+            latin:keyLabel="&#x0431;" />
+        <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU -->
         <Key
-            latin:keyLabel="\u044e" />
+            latin:keyLabel="&#x044E;" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight" />
diff --git a/java/res/xml/rows_spanish.xml b/java/res/xml/rows_spanish.xml
index 5fc2a00b9..5831a2bef 100644
--- a/java/res/xml/rows_spanish.xml
+++ b/java/res/xml/rows_spanish.xml
@@ -52,9 +52,9 @@
         <Key
             latin:keyLabel="l"
             latin:moreKeys="@string/more_keys_for_l" />
-        <!-- \u00f1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
+        <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
         <Key
-            latin:keyLabel="\u00f1" />
+            latin:keyLabel="&#x00F1;" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty3" />
diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml
index 81a9a4602..05699e0e1 100644
--- a/java/res/xml/rows_symbols.xml
+++ b/java/res/xml/rows_symbols.xml
@@ -103,9 +103,10 @@
             latin:keyStyle="toMoreSymbolKeyStyle"
             latin:keyWidth="15%p"
             latin:visualInsetsRight="1%p" />
+        <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
         <Key
             latin:keyLabel="!"
-            latin:moreKeys="¡" />
+            latin:moreKeys="&#x00A1;" />
         <Key
             latin:keyLabel="&quot;"
             latin:moreKeys="@string/more_keys_for_double_quote"
diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
index 168fc9ef9..3fb821486 100644
--- a/java/res/xml/rows_symbols_shift.xml
+++ b/java/res/xml/rows_symbols_shift.xml
@@ -34,23 +34,23 @@
             latin:keyLabel="`" />
         <Key
             latin:keyLabel="|" />
-        <!-- \u2022: "•" BULLET -->
+        <!-- U+2022: "•" BULLET -->
         <Key
-            latin:keyLabel="\u2022"
+            latin:keyLabel="&#x2022;"
             latin:moreKeys="@string/more_keys_for_bullet" />
-        <!-- \u221a: "√" SQUARE ROOT -->
+        <!-- U+221A: "√" SQUARE ROOT -->
         <Key
-            latin:keyLabel="\u221a" />
-        <!-- \u03c0: "π" GREEK SMALL LETTER PI -->
+            latin:keyLabel="&#x221A;" />
+        <!-- U+03C0: "π" GREEK SMALL LETTER PI -->
         <Key
-            latin:keyLabel="\u03c0"
+            latin:keyLabel="&#x03C0;"
             latin:moreKeys="Π" />
-        <!-- \u00f7: "÷" DIVISION SIGN -->
+        <!-- U+00F7: "÷" DIVISION SIGN -->
         <Key
-            latin:keyLabel="\u00f7" />
-        <!-- \u00d7: "×" MULTIPLICATION SIGN -->
+            latin:keyLabel="&#x00F7;" />
+        <!-- U+00D7: "×" MULTIPLICATION SIGN -->
         <Key
-            latin:keyLabel="\u00d7" />
+            latin:keyLabel="&#x00D7;" />
         <include
             latin:keyboardLayout="@xml/keys_curly_brackets" />
     </Row>
@@ -65,27 +65,27 @@
             latin:keyStyle="moreCurrency2KeyStyle" />
         <Key
             latin:keyStyle="moreCurrency3KeyStyle" />
-        <!-- \u00b0: "°" DEGREE SIGN
-             \u2032: "′" PRIME
-             \u2033: "″" DOUBLE PRIME -->
+        <!-- U+00B0: "°" DEGREE SIGN
+             U+2032: "′" PRIME
+             U+2033: "″" DOUBLE PRIME -->
         <Key
-            latin:keyLabel="\u00b0"
-            latin:moreKeys="\u2032,\u2033" />
-        <!-- \u2191: "↑" UPWARDS ARROW
-             \u2193: "↓" DOWNWARDS ARROW
-             \u2190: "←" LEFTWARDS ARROW
-             \u2192: "→" RIGHTWARDS ARROW -->
+            latin:keyLabel="&#x00B0;"
+            latin:moreKeys="&#x2032;,&#x2033;" />
+        <!-- U+2191: "↑" UPWARDS ARROW
+             U+2193: "↓" DOWNWARDS ARROW
+             U+2190: "←" LEFTWARDS ARROW
+             U+2192: "→" RIGHTWARDS ARROW -->
         <Key
             latin:keyLabel="^"
-            latin:moreKeys="\u2191,\u2193,\u2190,\u2192" />
+            latin:moreKeys="&#x2191;,&#x2193;,&#x2190;,&#x2192;" />
         <Key
             latin:keyLabel="_" />
-        <!-- \u2260: "≠" NOT EQUAL TO
-             \u2248: "≈" ALMOST EQUAL TO
-             \u221e: "∞" INFINITY -->
+        <!-- U+2260: "≠" NOT EQUAL TO
+             U+2248: "≈" ALMOST EQUAL TO
+             U+221E: "∞" INFINITY -->
         <Key
             latin:keyLabel="="
-            latin:moreKeys="\u2260,\u2248,\u221e" />
+            latin:moreKeys="&#x2260;,&#x2248;,&#x221E;" />
         <include
             latin:keyboardLayout="@xml/keys_square_brackets" />
     </Row>
@@ -96,20 +96,20 @@
             latin:keyStyle="backFromMoreSymbolKeyStyle"
             latin:keyWidth="15%p"
             latin:visualInsetsRight="1%p" />
-        <!-- \u2122: "™" TRADE MARK SIGN -->
+        <!-- U+2122: "™" TRADE MARK SIGN -->
         <Key
-            latin:keyLabel="\u2122" />
-        <!-- \u00ae: "®" REGISTERED SIGN -->
+            latin:keyLabel="&#x2122;" />
+        <!-- U+00AE: "®" REGISTERED SIGN -->
         <Key
-            latin:keyLabel="\u00ae" />
-        <!-- \u00a9: "©" COPYRIGHT SIGN -->
+            latin:keyLabel="&#x00AE;" />
+        <!-- U+00A9: "©" COPYRIGHT SIGN -->
         <Key
-            latin:keyLabel="\u00a9" />
-        <!-- \u00b6: "¶" PILCROW SIGN
-             \u00a7: "§" SECTION SIGN -->
+            latin:keyLabel="&#x00A9;" />
+        <!-- U+00B6: "¶" PILCROW SIGN
+             U+00A7: "§" SECTION SIGN -->
         <Key
-            latin:keyLabel="\u00b6"
-            latin:moreKeys="\u00a7" />
+            latin:keyLabel="&#x00B6;"
+            latin:moreKeys="&#x00A7;" />
         <Key
             latin:keyLabel="\\" />
         <include