Update some popular layouts with new moreKeys system

java/res/xml/keys_dvorak_123.xml

@@ -27,31 +27,26 @@
         >
             <Key
                 latin:keySpec="&quot;"
-                latin:keyHintLabel="1"
+                latin:moreKeys="!text/qwertysyms_q,!text/number_1" />
-                latin:additionalMoreKeys="1" />
         </case>
         <case
             latin:mode="url"
         >
             <Key
                 latin:keySpec="/"
-                latin:keyHintLabel="1"
+                latin:moreKeys="!text/qwertysyms_q,!text/number_1" />
-                latin:additionalMoreKeys="1" />
         </case>
         <case
             latin:mode="email"
         >
             <Key
                 latin:keySpec="\@"
-                latin:keyHintLabel="1"
+                latin:moreKeys="!text/qwertysyms_q,!text/number_1" />
-                latin:additionalMoreKeys="1" />
         </case>
         <default>
             <Key
                 latin:keySpec="\'"
-                latin:keyHintLabel="1"
+                latin:moreKeys="!text/qwertysyms_q,!text/number_1" />
-                latin:additionalMoreKeys="1"
-                latin:moreKeys="!,&quot;" />
         </default>
     </switch>
     <switch>
@@ -60,24 +55,18 @@
         >
             <Key
                 latin:keySpec="&lt;"
-                latin:keyHintLabel="2"
+                latin:moreKeys="!text/qwertysyms_w,!text/number_2" />
-                latin:additionalMoreKeys="2" />
             <Key
                 latin:keySpec="&gt;"
-                latin:keyHintLabel="3"
+                latin:moreKeys="!text/qwertysyms_e,!text/number_3" />
-                latin:additionalMoreKeys="3" />
         </case>
         <default>
             <Key
                 latin:keySpec=","
-                latin:keyHintLabel="2"
+                latin:moreKeys="!text/qwertysyms_w,!text/number_2" />
-                latin:additionalMoreKeys="2"
-                latin:moreKeys="\?,&lt;" />
             <Key
                 latin:keySpec="."
-                latin:keyHintLabel="3"
+                latin:moreKeys="!text/qwertysyms_e,!text/number_3" />
-                latin:additionalMoreKeys="3"
-                latin:moreKeys="&gt;" />
         </default>
     </switch>
 </merge>

java/res/xml/rowkeys_azerty1.xml

@@ -21,53 +21,24 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
+    <!-- a, z, e, r, t -->
     <Key
         latin:keySpec="a"
-        latin:keyHintLabel="1"
+        latin:moreKeys="!text/number_1,!text/qwertysyms_q,!text/morekeys_a,!text/morekeys_misc_a,!text/actions_a" />
-        latin:additionalMoreKeys="1"
-        latin:moreKeys="!text/morekeys_a" />
     <Key
         latin:keySpec="z"
-        latin:keyHintLabel="2"
+        latin:moreKeys="!text/number_2,!text/qwertysyms_w,!text/morekeys_z,!text/actions_z" />
-        latin:additionalMoreKeys="2"
-        latin:moreKeys="!text/morekeys_z" />
     <Key
         latin:keySpec="e"
-        latin:keyHintLabel="3"
+        latin:moreKeys="!text/number_3,!text/qwertysyms_e,!text/morekeys_e,!text/morekeys_misc_e,!text/actions_e" />
-        latin:additionalMoreKeys="3"
-        latin:moreKeys="!text/morekeys_e" />
     <Key
         latin:keySpec="r"
-        latin:keyHintLabel="4"
+        latin:moreKeys="!text/number_4,!text/qwertysyms_r,!text/morekeys_r,!text/actions_r" />
-        latin:additionalMoreKeys="4"
-        latin:moreKeys="!text/morekeys_r" />
     <Key
         latin:keySpec="t"
-        latin:keyHintLabel="5"
+        latin:moreKeys="!text/number_5,!text/qwertysyms_t,!text/morekeys_t,!text/actions_t" />
-        latin:additionalMoreKeys="5"
+
-        latin:moreKeys="!text/morekeys_t" />
+    <!-- y, u, i, o, p -->
-    <Key
+    <include
-        latin:keySpec="y"
+        latin:keyboardLayout="@xml/rowkeys_qwerty1_right5" />
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/morekeys_y" />
-    <Key
-        latin:keySpec="u"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/morekeys_u" />
-    <Key
-        latin:keySpec="i"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/morekeys_i" />
-    <Key
-        latin:keySpec="o"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9"
-        latin:moreKeys="!text/morekeys_o" />
-    <Key
-        latin:keySpec="p"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
 </merge>

java/res/xml/rowkeys_azerty2.xml

@@ -22,30 +22,33 @@
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
-        latin:keySpec="q" />
+        latin:keySpec="!text/keyspec_q"
+        latin:moreKeys="!text/morekeys_q,!text/actions_q,!text/qwertysyms_a" />
     <Key
         latin:keySpec="s"
-        latin:moreKeys="!text/morekeys_s" />
+        latin:moreKeys="!text/morekeys_s,!text/morekeys_misc_s,!text/actions_s,!text/qwertysyms_s" />
     <Key
         latin:keySpec="d"
-        latin:moreKeys="!text/morekeys_d" />
+        latin:moreKeys="!text/morekeys_d,!text/actions_d,!text/qwertysyms_d" />
     <Key
-        latin:keySpec="f" />
+        latin:keySpec="f"
+        latin:moreKeys="!text/morekeys_f,!text/actions_f,!text/qwertysyms_f" />
     <Key
         latin:keySpec="g"
-        latin:moreKeys="!text/morekeys_g" />
+        latin:moreKeys="!text/morekeys_g,!text/actions_g,!text/qwertysyms_g" />
     <Key
         latin:keySpec="h"
-        latin:moreKeys="!text/morekeys_h" />
+        latin:moreKeys="!text/morekeys_h,!text/actions_h,!text/qwertysyms_h" />
     <Key
         latin:keySpec="j"
-        latin:moreKeys="!text/morekeys_j" />
+        latin:moreKeys="!text/morekeys_j,!text/actions_j,!text/qwertysyms_j" />
     <Key
         latin:keySpec="k"
-        latin:moreKeys="!text/morekeys_k" />
+        latin:moreKeys="!text/morekeys_k,!text/actions_k,!text/qwertysyms_k" />
     <Key
         latin:keySpec="l"
-        latin:moreKeys="!text/morekeys_l" />
+        latin:moreKeys="!text/morekeys_l,!text/actions_l,!text/qwertysyms_l" />
     <Key
-        latin:keySpec="m" />
+        latin:keySpec="m"
+        latin:moreKeys="!text/morekeys_m,!text/actions_m,!text/qwertysyms_m" />
 </merge>

java/res/xml/rowkeys_azerty3.xml

@@ -23,20 +23,22 @@
 >
     <Key
         latin:keySpec="w"
-        latin:moreKeys="!text/morekeys_w" />
+        latin:moreKeys="!text/morekeys_w,!text/actions_w,!text/qwertysyms_z" />
     <Key
-        latin:keySpec="x" />
+        latin:keySpec="x"
+        latin:moreKeys="!text/morekeys_x,!text/actions_x,!text/qwertysyms_x" />
     <Key
         latin:keySpec="c"
-        latin:moreKeys="!text/morekeys_c" />
+        latin:moreKeys="!text/morekeys_c,!text/actions_c,!text/qwertysyms_c" />
     <Key
         latin:keySpec="v"
-        latin:moreKeys="!text/morekeys_v" />
+        latin:moreKeys="!text/morekeys_v,!text/actions_v,!text/qwertysyms_v" />
     <Key
-        latin:keySpec="b" />
+        latin:keySpec="b"
+        latin:moreKeys="!text/morekeys_b,!text/actions_b,!text/qwertysyms_b" />
     <Key
         latin:keySpec="n"
-        latin:moreKeys="!text/morekeys_n" />
+        latin:moreKeys="!text/morekeys_n,!text/actions_n,!text/qwertysyms_n" />
     <switch>
         <case
             latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"

java/res/xml/rowkeys_bepo1.xml

@@ -18,49 +18,32 @@
 >
     <Key
         latin:keySpec="b"
-        latin:keyHintLabel="1"
+        latin:moreKeys="!text/number_1,!text/qwertysyms_q,!text/morekeys_b,!text/actions_b" />
-        latin:additionalMoreKeys="1,\\%"/>
     <Key
         latin:keySpec="&#xE9;"
-        latin:keyHintLabel="2"
+        latin:moreKeys="!text/number_2,!text/qwertysyms_w,&#xE8;" />
-        latin:additionalMoreKeys="2,&#xE8;,\\\\" />
     <Key
         latin:keySpec="p"
-        latin:keyHintLabel="3"
+        latin:moreKeys="!text/number_3,!text/qwertysyms_e,!text/morekeys_p,!text/actions_p" />
-        latin:additionalMoreKeys="3,|" />
     <Key
         latin:keySpec="o"
-        latin:keyHintLabel="4"
+        latin:moreKeys="!text/number_4,!text/qwertysyms_r,!text/morekeys_o,!text/morekeys_misc_o,!text/actions_o" />
-        latin:additionalMoreKeys="4,="
-        latin:moreKeys="!text/morekeys_o" />
     <Key
         latin:keySpec="v"
-        latin:keyHintLabel="5"
+        latin:moreKeys="!text/number_5,!text/qwertysyms_t,!text/morekeys_v,!text/actions_v" />
-        latin:additionalMoreKeys="5,!text/keyspec_left_square_bracket"
-        latin:moreKeys="!text/morekeys_v" />
     <Key
         latin:keySpec="d"
-        latin:keyHintLabel="6"
+        latin:moreKeys="!text/number_6,!text/qwertysyms_y,!text/morekeys_d,!text/actions_d" />
-        latin:additionalMoreKeys="6,!text/keyspec_right_square_bracket"
-        latin:moreKeys="!text/morekeys_d" />
     <Key
         latin:keySpec="l"
-        latin:keyHintLabel="7"
+        latin:moreKeys="!text/number_7,!text/qwertysyms_u,!text/morekeys_l,!text/actions_l" />
-        latin:additionalMoreKeys="7,!text/keyspec_less_than"
-        latin:moreKeys="!text/morekeys_l" />
     <Key
         latin:keySpec="j"
-        latin:keyHintLabel="8"
+        latin:moreKeys="!text/number_8,!text/qwertysyms_i,!text/morekeys_j,!text/actions_j" />
-        latin:additionalMoreKeys="8,!text/keyspec_greater_than"
-        latin:moreKeys="!text/morekeys_j" />
     <Key
         latin:keySpec="z"
-        latin:keyHintLabel="9"
+        latin:moreKeys="!text/number_9,!text/qwertysyms_o,!text/morekeys_z,!text/actions_z" />
-        latin:additionalMoreKeys="9,!text/keyspec_left_curly_bracket"
-        latin:moreKeys="!text/morekeys_z" />
     <Key
         latin:keySpec="w"
-        latin:keyHintLabel="0"
+        latin:moreKeys="!text/number_0,!text/qwertysyms_p,!text/morekeys_w,!text/actions_w" />
-        latin:additionalMoreKeys="0,!text/keyspec_right_curly_bracket"
-        latin:moreKeys="!text/morekeys_w" />
 </merge>

java/res/xml/rowkeys_bepo2.xml

@@ -18,49 +18,32 @@
 >
     <Key
         latin:keySpec="a"
-        latin:keyHintLabel="\@"
+        latin:moreKeys="!text/qwertysyms_a,!text/morekeys_a,!text/morekeys_misc_a,!text/actions_a" />
-        latin:additionalMoreKeys="\\@"
-        latin:moreKeys="!text/morekeys_a" />
     <Key
         latin:keySpec="u"
-        latin:keyHintLabel="#"
+        latin:moreKeys="!text/qwertysyms_s,!text/morekeys_u,!text/morekeys_misc_u,!text/actions_y" />
-        latin:additionalMoreKeys="#"
-        latin:moreKeys="!text/morekeys_u" />
     <Key
         latin:keySpec="i"
-        latin:keyHintLabel="$"
+        latin:moreKeys="!text/qwertysyms_d,!text/morekeys_i,!text/morekeys_misc_i,!text/actions_i" />
-        latin:additionalMoreKeys="&#x24;,&#x20AC;,&#x00A3;,&#x00A5;,&#x00A2;"
-        latin:moreKeys="!text/morekeys_i" />
     <Key
         latin:keySpec="e"
-        latin:keyHintLabel="%"
+        latin:moreKeys="!text/qwertysyms_f,!text/morekeys_e,!text/morekeys_misc_e,!text/actions_e" />
-        latin:additionalMoreKeys="%"
-        latin:moreKeys="!text/morekeys_e" />
     <Key
         latin:keySpec="c"
-        latin:keyHintLabel="&amp;"
+        latin:moreKeys="!text/qwertysyms_g,!text/morekeys_c,!text/morekeys_misc_c,!text/actions_c" />
-        latin:additionalMoreKeys="&amp;,|"
-        latin:moreKeys="!text/morekeys_c" />
     <Key
         latin:keySpec="t"
-        latin:keyHintLabel="-"
+        latin:moreKeys="!text/qwertysyms_h,!text/morekeys_t,!text/actions_t" />
-        latin:additionalMoreKeys="-,&#x2013;,&#x2014;,_"
-        latin:moreKeys="!text/morekeys_t" />
     <Key
         latin:keySpec="s"
-        latin:keyHintLabel="+"
+        latin:moreKeys="!text/qwertysyms_j,!text/morekeys_s,!text/morekeys_misc_s,!text/actions_s" />>
-        latin:additionalMoreKeys="+,="
-        latin:moreKeys="!text/morekeys_s" />
     <Key
         latin:keySpec="r"
-        latin:keyHintLabel="("
+        latin:moreKeys="!text/qwertysyms_k,!text/morekeys_r,!text/actions_r" />
-        latin:additionalMoreKeys="(,[,{,&#x3c;"
-        latin:moreKeys="!text/morekeys_r" />
     <Key
         latin:keySpec="n"
-        latin:keyHintLabel=")"
+        latin:moreKeys="!text/qwertysyms_l,!text/morekeys_n,!text/actions_n" />
-        latin:additionalMoreKeys="),],},&#x3e;"
-        latin:moreKeys="!text/morekeys_n" />
     <Key
-        latin:keySpec="m" />
+        latin:keySpec="m"
+        latin:moreKeys="!text/morekeys_c,!text/actions_m" />
 </merge>

java/res/xml/rowkeys_bepo3.xml

@@ -18,35 +18,23 @@
 >
     <Key
         latin:keySpec="y"
-        latin:keyHintLabel="*"
+        latin:moreKeys="!text/qwertysyms_z,!text/morekeys_y,!text/actions_y" />
-        latin:additionalMoreKeys="*"
-        latin:moreKeys="!text/morekeys_y" />
     <Key
         latin:keySpec="x"
-        latin:keyHintLabel="&quot;"
+        latin:moreKeys="!text/qwertysyms_x,!text/morekeys_x,!text/actions_x" />
-        latin:additionalMoreKeys="&quot;" />
     <Key
         latin:keySpec="k"
-        latin:keyHintLabel="'"
+        latin:moreKeys="!text/qwertysyms_c,!text/morekeys_k,!text/actions_k" />
-        latin:additionalMoreKeys="'"
-        latin:moreKeys="!text/morekeys_k" />
     <Key
         latin:keySpec="q"
-        latin:keyHintLabel=":"
+        latin:moreKeys="!text/qwertysyms_v,!text/morekeys_q,!text/actions_q" />
-        latin:additionalMoreKeys=":"
-        latin:moreKeys="!text/morekeys_q" />
     <Key
         latin:keySpec="g"
-        latin:keyHintLabel=";"
+        latin:moreKeys="!text/qwertysyms_b,!text/morekeys_g,!text/actions_g" /> />
-        latin:additionalMoreKeys=";"
-        latin:moreKeys="!text/morekeys_g" />
     <Key
         latin:keySpec="h"
-        latin:keyHintLabel="!"
+        latin:moreKeys="!text/qwertysyms_n,!text/morekeys_h,!text/actions_h" />
-        latin:additionalMoreKeys="!"
-        latin:moreKeys="!text/morekeys_h" />
     <Key
         latin:keySpec="f"
-        latin:keyHintLabel="\?"
+        latin:moreKeys="!text/qwertysyms_m,!text/morekeys_f,!text/actions_f" />
-        latin:additionalMoreKeys="\?,/" />
 </merge>

java/res/xml/rowkeys_colemak1.xml

@@ -22,62 +22,44 @@
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
-        latin:keySpec="q"
+        latin:keySpec="!text/keyspec_q"
-        latin:keyHintLabel="1"
+        latin:moreKeys="!text/number_1,!text/qwertysyms_q,!text/morekeys_q,!text/actions_q" />
-        latin:additionalMoreKeys="1" />
     <Key
-        latin:keySpec="w"
+        latin:keySpec="!text/keyspec_w"
-        latin:keyHintLabel="2"
+        latin:moreKeys="!text/number_2,!text/qwertysyms_w,!text/morekeys_w,!text/actions_w" />
-        latin:additionalMoreKeys="2"
-        latin:moreKeys="!text/morekeys_w" />
     <Key
         latin:keySpec="f"
-        latin:keyHintLabel="3"
+        latin:moreKeys="!text/number_3,!text/qwertysyms_e,!text/morekeys_f,!text/actions_f" />
-        latin:additionalMoreKeys="3" />
     <Key
         latin:keySpec="p"
-        latin:keyHintLabel="4"
+        latin:moreKeys="!text/number_4,!text/qwertysyms_r,!text/morekeys_p,!text/actions_p" />
-        latin:additionalMoreKeys="4" />
     <Key
         latin:keySpec="g"
-        latin:keyHintLabel="5"
+        latin:moreKeys="!text/number_5,!text/qwertysyms_t,!text/morekeys_g,!text/actions_g" />
-        latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/morekeys_g" />
     <Key
         latin:keySpec="j"
-        latin:keyHintLabel="6"
+        latin:moreKeys="!text/number_6,!text/qwertysyms_y,!text/morekeys_j,!text/actions_j" />
-        latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/morekeys_j" />
     <Key
         latin:keySpec="l"
-        latin:keyHintLabel="7"
+        latin:moreKeys="!text/number_7,!text/qwertysyms_u,!text/morekeys_l,!text/actions_l" />
-        latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/morekeys_l" />
     <Key
         latin:keySpec="u"
-        latin:keyHintLabel="8"
+        latin:moreKeys="!text/number_8,!text/qwertysyms_i,!text/morekeys_u,!text/morekeys_misc_u,!text/actions_u" />
-        latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/morekeys_u" />
     <Key
         latin:keySpec="y"
-        latin:keyHintLabel="9"
+        latin:moreKeys="!text/number_9,!text/qwertysyms_o,!text/morekeys_y,!text/actions_y" />
-        latin:additionalMoreKeys="9"
-        latin:moreKeys="!text/morekeys_y" />
     <switch>
         <case
             latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
         >
             <Key
                 latin:keySpec=":"
-                latin:keyHintLabel="0"
+                latin:moreKeys="!text/number_0,!text/qwertysyms_p" />
-                latin:additionalMoreKeys="0" />
         </case>
         <default>
             <Key
                 latin:keySpec=";"
-                latin:keyHintLabel="0"
+                latin:moreKeys="!text/number_0,!text/qwertysyms_p" />
-                latin:additionalMoreKeys="0"
-                latin:moreKeys=":" />
         </default>
     </switch>
 </merge>

java/res/xml/rowkeys_colemak2.xml

@@ -23,32 +23,32 @@
 >
     <Key
         latin:keySpec="a"
-        latin:moreKeys="!text/morekeys_a" />
+        latin:moreKeys="!text/qwertysyms_a,!text/morekeys_a,!text/morekeys_misc_a,!text/actions_a" />
     <Key
         latin:keySpec="r"
-        latin:moreKeys="!text/morekeys_r" />
+        latin:moreKeys="!text/qwertysyms_s,!text/morekeys_r,!text/actions_r" />
     <Key
         latin:keySpec="s"
-        latin:moreKeys="!text/morekeys_s" />
+        latin:moreKeys="!text/qwertysyms_d,!text/morekeys_s,!text/actions_s" />
     <Key
         latin:keySpec="t"
-        latin:moreKeys="!text/morekeys_t" />
+        latin:moreKeys="!text/qwertysyms_f,!text/morekeys_t,!text/actions_t" />
     <Key
         latin:keySpec="d"
-        latin:moreKeys="!text/morekeys_d" />
+        latin:moreKeys="!text/qwertysyms_g,!text/morekeys_d,!text/actions_d" />
     <Key
         latin:keySpec="h"
-        latin:moreKeys="!text/morekeys_h" />
+        latin:moreKeys="!text/qwertysyms_h,!text/morekeys_h,!text/actions_h" />
     <Key
         latin:keySpec="n"
-        latin:moreKeys="!text/morekeys_n" />
+        latin:moreKeys="!text/qwertysyms_j,!text/morekeys_n,!text/actions_n" />
     <Key
         latin:keySpec="e"
-        latin:moreKeys="!text/morekeys_e" />
+        latin:moreKeys="!text/qwertysyms_k,!text/morekeys_e,!text/morekeys_misc_e,!text/actions_e" />
     <Key
         latin:keySpec="i"
-        latin:moreKeys="!text/morekeys_i" />
+        latin:moreKeys="!text/qwertysyms_l,!text/morekeys_i,!text/morekeys_misc_i,!text/actions_i" />
     <Key
         latin:keySpec="o"
-        latin:moreKeys="!text/morekeys_o" />
+        latin:moreKeys="!text/morekeys_o,!text/morekeys_misc_o,!text/actions_o" />
 </merge>

java/res/xml/rowkeys_colemak3.xml

@@ -23,20 +23,23 @@
 >
     <Key
         latin:keySpec="z"
-        latin:moreKeys="!text/morekeys_z" />
+        latin:moreKeys="!text/qwertysyms_z,!text/morekeys_z,!text/actions_z" />
     <Key
-        latin:keySpec="x" />
+        latin:keySpec="x"
+        latin:moreKeys="!text/qwertysyms_x,!text/morekeys_x,!text/actions_x" />
     <Key
         latin:keySpec="c"
-        latin:moreKeys="!text/morekeys_c" />
+        latin:moreKeys="!text/qwertysyms_c,!text/morekeys_c,!text/actions_c" />
     <Key
         latin:keySpec="v"
-        latin:moreKeys="!text/morekeys_v" />
+        latin:moreKeys="!text/qwertysyms_v,!text/morekeys_v,!text/actions_v" />
     <Key
-        latin:keySpec="b" />
+        latin:keySpec="b"
+        latin:moreKeys="!text/qwertysyms_b,!text/morekeys_b,!text/actions_b" />
     <Key
         latin:keySpec="k"
-        latin:moreKeys="!text/morekeys_k" />
+        latin:moreKeys="!text/qwertysyms_n,!text/morekeys_k,!text/actions_k" />
     <Key
-        latin:keySpec="m" />
+        latin:keySpec="m"
+        latin:moreKeys="!text/qwertysyms_m,!text/morekeys_n,!text/actions_m" />
 </merge>

java/res/xml/rowkeys_dvorak1.xml

@@ -25,35 +25,23 @@
         latin:keyboardLayout="@xml/keys_dvorak_123" />
     <Key
         latin:keySpec="p"
-        latin:keyHintLabel="4"
+        latin:moreKeys="!text/morekeys_p,!text/qwertysyms_r,!text/number_4,!text/actions_p" />
-        latin:additionalMoreKeys="4" />
     <Key
         latin:keySpec="y"
-        latin:keyHintLabel="5"
+        latin:moreKeys="!text/morekeys_y,!text/qwertysyms_t,!text/number_5,!text/actions_y" />
-        latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/morekeys_y" />
     <Key
         latin:keySpec="f"
-        latin:keyHintLabel="6"
+        latin:moreKeys="!text/morekeys_f,!text/qwertysyms_y,!text/number_6,!text/actions_f" />
-        latin:additionalMoreKeys="6" />
     <Key
         latin:keySpec="g"
-        latin:keyHintLabel="7"
+        latin:moreKeys="!text/morekeys_g,!text/qwertysyms_u,!text/number_7,!text/actions_g" />
-        latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/morekeys_g" />
     <Key
         latin:keySpec="c"
-        latin:keyHintLabel="8"
+        latin:moreKeys="!text/morekeys_c,!text/morekeys_misc_c,!text/qwertysyms_i,!text/number_8,!text/actions_c" />
-        latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/morekeys_c" />
     <Key
         latin:keySpec="r"
-        latin:keyHintLabel="9"
+        latin:moreKeys="!text/morekeys_r,!text/qwertysyms_o,!text/number_9,!text/actions_r" />
-        latin:additionalMoreKeys="9"
-        latin:moreKeys="!text/morekeys_r" />
     <Key
         latin:keySpec="l"
-        latin:keyHintLabel="0"
+        latin:moreKeys="!text/morekeys_l,!text/qwertysyms_p,!text/number_0,!text/actions_l" />
-        latin:additionalMoreKeys="0"
-        latin:moreKeys="!text/morekeys_l" />
 </merge>

java/res/xml/rowkeys_dvorak2.xml

@@ -23,32 +23,32 @@
 >
     <Key
         latin:keySpec="a"
-        latin:moreKeys="!text/morekeys_a" />
+        latin:moreKeys="!text/morekeys_a,!text/morekeys_misc_a,!text/actions_a,!text/qwertysyms_a" />
     <Key
         latin:keySpec="o"
-        latin:moreKeys="!text/morekeys_o" />
+        latin:moreKeys="!text/morekeys_o,!text/morekeys_misc_o,!text/actions_o,!text/qwertysyms_s" />
     <Key
         latin:keySpec="e"
-        latin:moreKeys="!text/morekeys_e" />
+        latin:moreKeys="!text/morekeys_e,!text/morekeys_misc_e,!text/actions_e,!text/qwertysyms_d" />
     <Key
         latin:keySpec="u"
-        latin:moreKeys="!text/morekeys_u" />
+        latin:moreKeys="!text/morekeys_u,!text/morekeys_misc_u,!text/actions_u,!text/qwertysyms_f" />
     <Key
         latin:keySpec="i"
-        latin:moreKeys="!text/morekeys_i" />
+        latin:moreKeys="!text/morekeys_i,!text/morekeys_misc_i,!text/actions_i,!text/qwertysyms_g" />
     <Key
         latin:keySpec="d"
-        latin:moreKeys="!text/morekeys_d" />
+        latin:moreKeys="!text/morekeys_d,!text/actions_d,!text/qwertysyms_h" />
     <Key
         latin:keySpec="h"
-        latin:moreKeys="!text/morekeys_h" />
+        latin:moreKeys="!text/morekeys_h,!text/actions_h,!text/qwertysyms_j" />
     <Key
         latin:keySpec="t"
-        latin:moreKeys="!text/morekeys_t" />
+        latin:moreKeys="!text/morekeys_t,!text/actions_t,!text/qwertysyms_k" />
     <Key
         latin:keySpec="n"
-        latin:moreKeys="!text/morekeys_n" />
+        latin:moreKeys="!text/morekeys_n,!text/morekeys_misc_n,!text/actions_n,!text/qwertysyms_l" />
     <Key
         latin:keySpec="s"
-        latin:moreKeys="!text/morekeys_s" />
+        latin:moreKeys="!text/morekeys_s,!text/morekeys_misc_s,!text/actions_s" />
 </merge>

java/res/xml/rowkeys_dvorak3.xml

@@ -23,20 +23,23 @@
 >
     <Key
         latin:keySpec="j"
-        latin:moreKeys="!text/morekeys_j" />
+        latin:moreKeys="!text/morekeys_j,!text/actions_j,!text/qwertysyms_z" />
     <Key
         latin:keySpec="k"
-        latin:moreKeys="!text/morekeys_k" />
+        latin:moreKeys="!text/morekeys_k,!text/actions_k,!text/qwertysyms_x" />
     <Key
-        latin:keySpec="x" />
+        latin:keySpec="x"
+        latin:moreKeys="!text/morekeys_x,!text/actions_x,!text/qwertysyms_c" />
     <Key
-        latin:keySpec="b" />
+        latin:keySpec="b"
+        latin:moreKeys="!text/morekeys_b,!text/actions_b,!text/qwertysyms_v" />
     <Key
-        latin:keySpec="m" />
+        latin:keySpec="m"
+        latin:moreKeys="!text/morekeys_m,!text/actions_m,!text/qwertysyms_b" />
     <Key
         latin:keySpec="w"
-        latin:moreKeys="!text/morekeys_w" />
+        latin:moreKeys="!text/morekeys_w,!text/actions_w,!text/qwertysyms_n" />
     <Key
         latin:keySpec="v"
-        latin:moreKeys="!text/morekeys_v" />
+        latin:moreKeys="!text/morekeys_v,!text/actions_v,!text/qwertysyms_m" />
 </merge>

java/res/xml/rowkeys_qwertz1.xml

@@ -21,53 +21,24 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
-    <Key
+    <!-- q, w, e, r, t -->
-        latin:keySpec="!text/keyspec_q"
+    <include
-        latin:keyHintLabel="1"
+        latin:keyboardLayout="@xml/rowkeys_qwerty1_left5" />
-        latin:additionalMoreKeys="1,\\%"
+
-        latin:moreKeys="!text/morekeys_q" />
+    <!-- z, u, i, o, p -->
-    <Key
-        latin:keySpec="!text/keyspec_w"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2,\\\\"
-        latin:moreKeys="!text/morekeys_w" />
-    <Key
-        latin:keySpec="e"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3,|"
-        latin:moreKeys="!text/morekeys_e" />
-    <Key
-        latin:keySpec="r"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4,="
-        latin:moreKeys="!text/morekeys_r" />
-    <Key
-        latin:keySpec="t"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5,!text/keyspec_left_square_bracket"
-        latin:moreKeys="!text/morekeys_t" />
     <Key
         latin:keySpec="z"
-        latin:keyHintLabel="6"
+        latin:moreKeys="!text/morekeys_z,!text/qwertysyms_z,!text/actions_z" />
-        latin:additionalMoreKeys="6,!text/keyspec_right_square_bracket"
-        latin:moreKeys="!text/morekeys_z" />
     <Key
         latin:keySpec="u"
-        latin:keyHintLabel="7"
+        latin:moreKeys="!text/morekeys_u,!text/morekeys_misc_u,!text/qwertysyms_u,!text/number_7,!text/actions_u" />
-        latin:additionalMoreKeys="7,!text/keyspec_less_than"
-        latin:moreKeys="!text/morekeys_u" />
     <Key
         latin:keySpec="i"
-        latin:keyHintLabel="8"
+        latin:moreKeys="!text/morekeys_i,!text/morekeys_misc_i,!text/qwertysyms_i,!text/number_8,!text/actions_i" />
-        latin:additionalMoreKeys="8,!text/keyspec_greater_than"
-        latin:moreKeys="!text/morekeys_i" />
     <Key
         latin:keySpec="o"
-        latin:keyHintLabel="9"
+        latin:moreKeys="!text/morekeys_o,!text/morekeys_misc_o,!text/qwertysyms_o,!text/number_9,!text/actions_o" />
-        latin:additionalMoreKeys="9,!text/keyspec_left_curly_bracket"
-        latin:moreKeys="!text/morekeys_o" />
     <Key
         latin:keySpec="p"
-        latin:keyHintLabel="0"
+        latin:moreKeys="!text/morekeys_p,!text/qwertysyms_p,!text/number_0,!text/actions_p" />
-        latin:additionalMoreKeys="0,!text/keyspec_right_curly_bracket" />
 </merge>

java/res/xml/rowkeys_qwertz3.xml

@@ -22,36 +22,19 @@
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <Key
-        latin:keySpec="y"
+        latin:keySpec="!text/keyspec_y"
-        latin:keyHintLabel="*"
+        latin:moreKeys="!text/morekeys_y,!text/qwertysyms_y,!text/number_6,!text/actions_y" />
-        latin:additionalMoreKeys="*"
-        latin:moreKeys="!text/morekeys_y" />
     <Key
-        latin:keySpec="x"
+        latin:keySpec="!text/keyspec_x"
-        latin:keyHintLabel="&quot;"
+        latin:moreKeys="!text/morekeys_x,!text/qwertysyms_x,!text/actions_x" />
-        latin:additionalMoreKeys="&quot;"
-        latin:moreKeys="!text/morekeys_x" />
     <Key
         latin:keySpec="c"
-        latin:keyHintLabel="'"
+        latin:moreKeys="!text/morekeys_c,!text/morekeys_misc_c,!text/qwertysyms_c,!text/actions_c" />
-        latin:additionalMoreKeys="'"
-        latin:moreKeys="!text/morekeys_c" />
     <Key
         latin:keySpec="v"
-        latin:keyHintLabel=":"
+        latin:moreKeys="!text/morekeys_v,!text/qwertysyms_v,!text/actions_v" />
-        latin:additionalMoreKeys=":"
+
-        latin:moreKeys="!text/morekeys_v" />
+    <!-- b, n, m -->
-    <Key
+    <include
-        latin:keySpec="b"
+        latin:keyboardLayout="@xml/rowkeys_qwerty3_right3" />
-        latin:keyHintLabel=";"
-        latin:additionalMoreKeys=";" />
-    <Key
-        latin:keySpec="n"
-        latin:keyHintLabel="!"
-        latin:additionalMoreKeys="!"
-        latin:moreKeys="!text/morekeys_n" />
-    <Key
-        latin:keySpec="m"
-        latin:keyHintLabel="\?"
-        latin:additionalMoreKeys="\?,/" />
 </merge>

tools/make-keyboard-text-py/locales/DEFAULT.json

@@ -78,9 +78,12 @@
         "misc_c": [
             "ç"
         ],
-
+        "nordic_row2_10": [
-        "nordic_row2_10": [],
+            "ø"
-        "nordic_row2_11": [],
+        ],
+        "nordic_row2_11": [
+            "æ"
+        ],
         "east_slavic_row2_2": [],
         "east_slavic_row2_11": [],
         "cyrillic_u": [],
@@ -254,9 +257,9 @@
         "w": "w",
         "y": "y",
         "x": "x",
-        "nordic_row1_11": "",
+        "nordic_row1_11": "å",
-        "nordic_row2_10": "",
+        "nordic_row2_10": "ö",
-        "nordic_row2_11": "",
+        "nordic_row2_11": "ä",
         "east_slavic_row1_9": "",
         "east_slavic_row2_2": "",
         "east_slavic_row2_11": "",