2 files changed, 26 insertions, 22 deletions

diff --git a/java/res/xml/rowkeys_sinhala1.xml b/java/res/xml/rowkeys_sinhala1.xml
index f258ae29e..e784d2d3a 100644
--- a/java/res/xml/rowkeys_sinhala1.xml
+++ b/java/res/xml/rowkeys_sinhala1.xml
@@ -27,92 +27,93 @@
         >
             <!-- U+0DD6: "ූ" SINHALA VOWEL SIGN DIGA PAA-PILLA -->
             <Key
-                latin:keySpec="&#x0DD6;"
-                latin:additionalMoreKeys="1" />
+                latin:keySpec="&#x0DD6;" />
             <!-- U+0D8B: "උ" SINHALA LETTER UYANNA -->
             <Key
-                latin:keySpec="&#x0D8B;"
-                latin:additionalMoreKeys="2" />
+                latin:keySpec="&#x0D8B;" />
             <!-- U+0DD1: "ෑ" SINHALA VOWEL SIGN DIGA AEDA-PILLA -->
             <Key
-                latin:keySpec="&#x0DD1;"
-                latin:additionalMoreKeys="3" />
+                latin:keySpec="&#x0DD1;" />
             <!-- U+0D8D: "ඍ" SINHALA LETTER IRUYANNA -->
             <Key
-                latin:keySpec="&#x0D8D;"
-                latin:additionalMoreKeys="4" />
+                latin:keySpec="&#x0D8D;" />
             <!-- U+0D94: "ඔ" SINHALA LETTER OYANNA -->
             <Key
-                latin:keySpec="&#x0D94;"
-                latin:additionalMoreKeys="5" />
+                latin:keySpec="&#x0D94;" />
             <!-- U+0DC1: "ශ" SINHALA LETTER TAALUJA SAYANNA -->
             <Key
-                latin:keySpec="&#x0DC1;"
-                latin:additionalMoreKeys="6" />
+                latin:keySpec="&#x0DC1;" />
             <!-- U+0DB9: "ඹ" SINHALA LETTER AMBA BAYANNA -->
             <Key
-                latin:keySpec="&#x0DB9;"
-                latin:additionalMoreKeys="7" />
+                latin:keySpec="&#x0DB9;" />
             <!-- U+0DC2: "ෂ" SINHALA LETTER MUURDHAJA SAYANNA -->
             <Key
-                latin:keySpec="&#x0DC2;"
-                latin:additionalMoreKeys="8" />
+                latin:keySpec="&#x0DC2;" />
             <!-- U+0DB0: "ධ" SINHALA LETTER MAHAAPRAANA DAYANNA -->
             <Key
-                latin:keySpec="&#x0DB0;"
-                latin:additionalMoreKeys="9" />
+                latin:keySpec="&#x0DB0;" />
             <!-- U+0DA1: "ඡ" SINHALA LETTER MAHAAPRAANA CAYANNA -->
             <Key
-                latin:keySpec="&#x0DA1;"
-                latin:additionalMoreKeys="0" />
+                latin:keySpec="&#x0DA1;" />
             <!-- U+0DA5: "ඥ" SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA
                  U+0DF4: "෴" SINHALA PUNCTUATION KUNDDALIYA  -->
             <Key
                 latin:keySpec="&#x0DA5;"
-                latin:moreKeys="&#x0DF4;" />
+                latin:moreKeys="&#x0DF4;"
+                latin:keyLabelFlags="autoXScale" />
         </case>
         <default>
             <!-- U+0DD4: "ු" SINHALA VOWEL SIGN KETTI PAA-PILLA -->
             <Key
                 latin:keySpec="&#x0DD4;"
+                latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1" />
             <!-- U+0D85: "අ" SINHALA LETTER AYANNA -->
             <Key
                 latin:keySpec="&#x0D85;"
+                latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2" />
             <!-- U+0DD0: "ැ" SINHALA VOWEL SIGN KETTI AEDA-PILLA -->
             <Key
                 latin:keySpec="&#x0DD0;"
+                latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3" />
             <!-- U+0DBB: "ර" SINHALA LETTER RAYANNA -->
             <Key
                 latin:keySpec="&#x0DBB;"
+                latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4" />
             <!-- U+0D91: "එ" SINHALA LETTER EYANNA -->
             <Key
                 latin:keySpec="&#x0D91;"
+                latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5" />
             <!-- U+0DC4: "හ" SINHALA LETTER HAYANNA -->
             <Key
                 latin:keySpec="&#x0DC4;"
+                latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6" />
             <!-- U+0DB8: "ම" SINHALA LETTER MAYANNA -->
             <Key
                 latin:keySpec="&#x0DB8;"
+                latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7" />
             <!-- U+0DC3: "ස" SINHALA LETTER DANTAJA SAYANNA -->
             <Key
                 latin:keySpec="&#x0DC3;"
+                latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8" />
             <!-- U+0DAF: "ද" SINHALA LETTER ALPAPRAANA DAYANNA
                  U+0DB3: "ඳ" SINHALA LETTER SANYAKA DAYANNA -->
             <Key
                 latin:keySpec="&#x0DAF;"
                 latin:moreKeys="&#x0DB3;"
+                latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9" />
             <!-- U+0DA0: "ච" SINHALA LETTER ALPAPRAANA CAYANNA -->
             <Key
                 latin:keySpec="&#x0DA0;"
+                latin:keyHintLabel="0"
                 latin:additionalMoreKeys="0" />
             <!-- U+0DA4: "ඤ" SINHALA LETTER TAALUJA NAASIKYAYA
                  U+0DF4: "෴" SINHALA PUNCTUATION KUNDDALIYA -->
diff --git a/java/res/xml/rows_sinhala.xml b/java/res/xml/rows_sinhala.xml
index b47b373b6..5a058c96e 100644
--- a/java/res/xml/rows_sinhala.xml
+++ b/java/res/xml/rows_sinhala.xml
@@ -25,18 +25,21 @@
         latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <include
             latin:keyboardLayout="@xml/rowkeys_sinhala1" />
     </Row>
     <Row
-            latin:keyWidth="9.091%p"
+        latin:keyWidth="9.091%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <include
             latin:keyboardLayout="@xml/rowkeys_sinhala2" />
     </Row>
     <Row
         latin:keyWidth="8.711%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"