Add number row to most layouts

java/res/xml/row_number_switch.xml

@@ -0,0 +1,17 @@
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+>
+    <switch>
+        <case latin:numberRow="true">
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_numbers" />
+            </Row>
+        </case>
+        <default>
+
+        </default>
+    </switch>
+</merge>

java/res/xml/rows_arabic.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"

java/res/xml/rows_armenian_phonetic.xml

@@ -21,6 +21,7 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <include latin:keyboardLayout="@xml/key_styles_currency" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="10.0%p"
         latin:keyLabelFlags="fontNormal"

java/res/xml/rows_azerty.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="10%p"
     >

java/res/xml/rows_bengali.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"

java/res/xml/rows_bengali_akkhor.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyLabelFlags="fontNormal"
         latin:keyWidth="9.091%p" >

java/res/xml/rows_bulgarian.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
     >

java/res/xml/rows_bulgarian_bds.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
     >

java/res/xml/rows_colemak.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="10%p"
     >

java/res/xml/rows_dvorak.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="10%p"
     >

java/res/xml/rows_east_slavic.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
     >

java/res/xml/rows_farsi.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"

java/res/xml/rows_georgian.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="10%p"
     >

java/res/xml/rows_greek.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="10%p"
     >

java/res/xml/rows_hebrew.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="10%p"
     >

java/res/xml/rows_hindi.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"

java/res/xml/rows_hindi_compact.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"

java/res/xml/rows_kannada.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"

java/res/xml/rows_khmer.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="8.3333%p"
         latin:keyLabelFlags="fontNormal|autoXScale"

java/res/xml/rows_lao.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="8.3333%p"
         latin:keyLabelFlags="fontNormal"

java/res/xml/rows_malayalam.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"

java/res/xml/rows_marathi.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"

java/res/xml/rows_mongolian.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
     >

java/res/xml/rows_nepali_romanized.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"

java/res/xml/rows_nepali_traditional.xml

@@ -21,6 +21,7 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
     <include latin:keyboardLayout="@xml/key_styles_currency" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"

java/res/xml/rows_nordic.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
     >

java/res/xml/rows_qwerty.xml

@@ -23,19 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
-    <switch>
+    <include latin:keyboardLayout="@xml/row_number_switch" />
-        <case latin:numberRow="true">
-            <Row
-                latin:keyWidth="10%p"
-                >
-                <include
-                    latin:keyboardLayout="@xml/rowkeys_numbers" />
-            </Row>
-        </case>
-        <default>
-
-        </default>
-    </switch>
     <Row
         latin:keyWidth="10%p"
     >

java/res/xml/rows_qwertz.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="10%p"
     >

java/res/xml/rows_serbian_qwertz.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row latin:keyWidth="9.091%p" >
         <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz1" />
     </Row>

java/res/xml/rows_sinhala.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"

java/res/xml/rows_south_slavic.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
     >

java/res/xml/rows_spanish.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="10%p"
     >

java/res/xml/rows_swiss.xml

@@ -23,6 +23,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
     >

java/res/xml/rows_symbols.xml

@@ -31,6 +31,10 @@
         <include
             latin:keyboardLayout="@xml/rowkeys_symbols1" />
     </Row>
+    <switch>
+        <case latin:numberRow="true"> <Row /> </case>
+        <default> </default>
+    </switch>
     <Row
         latin:keyWidth="10%p"
     >

java/res/xml/rows_symbols_shift.xml

@@ -25,6 +25,10 @@
         latin:keyboardLayout="@xml/key_styles_common" />
     <include
         latin:keyboardLayout="@xml/key_styles_currency" />
+    <switch>
+        <case latin:numberRow="true"> <Row /> </case>
+        <default> </default>
+    </switch>
     <Row
         latin:keyWidth="10%p"
     >

java/res/xml/rows_tamil.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"

java/res/xml/rows_telugu.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"

java/res/xml/rows_thai.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="8.3333%p"
         latin:keyLabelFlags="fontNormal"

java/res/xml/rows_uzbek.xml

@@ -20,6 +20,7 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row latin:keyWidth="9.091%p" >
         <include latin:keyboardLayout="@xml/rowkeys_uzbek1" />
     </Row>