Remove unnecessary android:codes attribute

If there is no android:codes specified, the first character of
keyLabel's code point will be used instead.

Also introduce readable codes as @integer/key_XXX resources

Bug: 2973749
Change-Id: If9021ca35f9a7b922817e2099186fce0cd993652

2 files changed, 35 insertions, 91 deletions

diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml
index 34063f94e..3c90e3163 100644
--- a/java/res/xml-sv/kbd_qwerty.xml
+++ b/java/res/xml-sv/kbd_qwerty.xml
@@ -35,50 +35,40 @@
 >
     <Row>
         <Key
-            android:codes="113"
             android:keyLabel="q"
             android:keyWidth="8.75%p"
             android:keyEdgeFlags="left" />
         <Key
-            android:codes="119"
             android:keyLabel="w" />
         <Key
-            android:codes="101"
             android:keyLabel="e"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="éèêëę€" />
         <Key
-            android:codes="114"
             android:keyLabel="r"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ř" />
         <Key
-            android:codes="116"
             android:keyLabel="t"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ťþ" />
         <Key
-            android:codes="121"
             android:keyLabel="y"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ýÿü" />
         <Key
-            android:codes="117"
             android:keyLabel="u"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="úùûū" />
         <Key
-            android:codes="105"
             android:keyLabel="i"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="íìîï" />
         <Key
-            android:codes="111"
             android:keyLabel="o"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="óòôõ" />
         <Key
-            android:codes="112"
             android:keyLabel="p" />
         <Key
             android:keyLabel="å"
@@ -87,39 +77,30 @@
     </Row>
     <Row>
         <Key
-            android:codes="97"
             android:keyLabel="a"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="áàâąã"
             android:keyWidth="8.75%p"
             android:keyEdgeFlags="left" />
         <Key
-            android:codes="115"
             android:keyLabel="s"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="śšşß" />
         <Key
-            android:codes="100"
             android:keyLabel="d"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ðď" />
         <Key
-            android:codes="102"
             android:keyLabel="f" />
         <Key
-            android:codes="103"
             android:keyLabel="g" />
         <Key
-            android:codes="104"
             android:keyLabel="h" />
         <Key
-            android:codes="106"
             android:keyLabel="j" />
         <Key
-            android:codes="107"
             android:keyLabel="k" />
         <Key
-            android:codes="108"
             android:keyLabel="l"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ł" />
@@ -138,7 +119,7 @@
         android:keyWidth="10%p"
     >
         <Key
-            android:codes="-1"
+            android:codes="@integer/key_shift"
             android:keyIcon="@drawable/sym_keyboard_shift"
             android:keyWidth="15%p"
             android:isModifier="true"
@@ -146,36 +127,29 @@
             android:isSticky="true"
             android:keyEdgeFlags="left" />
         <Key
-            android:codes="122"
             android:keyLabel="z"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="źžż" />
         <Key
-            android:codes="120"
             android:keyLabel="x" />
         <Key
-            android:codes="99"
             android:keyLabel="c"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="çćč" />
         <Key
-            android:codes="118"
             android:keyLabel="v"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="w" />
         <Key
-            android:codes="98"
             android:keyLabel="b" />
         <Key
-            android:codes="110"
             android:keyLabel="n"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ńñň" />
         <Key
-            android:codes="109"
             android:keyLabel="m" />
         <Key
-            android:codes="-5"
+            android:codes="@integer/key_delete"
             android:keyIcon="@drawable/sym_keyboard_delete"
             android:keyWidth="15%p"
             android:keyEdgeFlags="right"
@@ -187,7 +161,7 @@
         android:rowEdgeFlags="bottom"
     >
         <Key
-            android:codes="-2"
+            android:codes="@integer/key_symbol"
             android:keyLabel="@string/label_symbol_key"
             android:keyWidth="15%p"
             android:keyEdgeFlags="left"
@@ -205,20 +179,19 @@
             android:keyWidth="10%p"
             android:isModifier="true" />
         <Key
-            android:codes="32"
+            android:codes="@integer/key_space"
             android:keyIcon="@drawable/sym_keyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:keyWidth="30%p"
             android:isRepeatable="true"
             android:isModifier="true" />
         <Key
-            android:codes="46"
             android:keyLabel="."
             android:popupKeyboard="@xml/popup_punctuation"
             android:keyWidth="10%p"
             android:isModifier="true" />
         <Key
-            android:codes="10"
+            android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_keyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
             android:keyWidth="25%p"
@@ -230,7 +203,7 @@
         android:rowEdgeFlags="bottom"
     >
         <Key
-            android:codes="-2"
+            android:codes="@integer/key_symbol"
             android:keyLabel="@string/label_symbol_key"
             android:keyWidth="15%p"
             android:keyEdgeFlags="left"
@@ -246,7 +219,7 @@
             android:keyWidth="10%p"
             android:isModifier="true" />
         <Key
-            android:codes="32"
+            android:codes="@integer/key_space"
             android:keyIcon="@drawable/sym_keyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:keyWidth="30%p"
@@ -258,7 +231,7 @@
             android:keyWidth="10%p"
             android:isModifier="true" />
         <Key
-            android:codes="10"
+            android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_keyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
             android:keyWidth="25%p"
@@ -270,7 +243,7 @@
         android:rowEdgeFlags="bottom"
     >
         <Key
-            android:codes="-2"
+            android:codes="@integer/key_symbol"
             android:keyLabel="@string/label_symbol_key"
             android:keyWidth="15%p"
             android:keyEdgeFlags="left"
@@ -285,7 +258,7 @@
             android:keyLabel="\@"
             android:isModifier="true" />
         <Key
-            android:codes="32"
+            android:codes="@integer/key_space"
             android:keyIcon="@drawable/sym_keyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:keyWidth="30%p"
@@ -296,7 +269,7 @@
             android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
-            android:codes="10"
+            android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_keyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
             android:keyWidth="25%p"
@@ -308,7 +281,7 @@
         android:rowEdgeFlags="bottom"
     >
         <Key
-            android:codes="-2"
+            android:codes="@integer/key_symbol"
             android:keyLabel="@string/label_symbol_key"
             android:keyWidth="15%p"
             android:keyEdgeFlags="left"
@@ -326,14 +299,13 @@
             android:keyWidth="10%p"
             android:isModifier="true" />
         <Key
-            android:codes="32"
+            android:codes="@integer/key_space"
             android:keyIcon="@drawable/sym_keyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:keyWidth="30%p"
             android:isRepeatable="true"
             android:isModifier="true" />
         <Key
-            android:codes="46"
             android:keyLabel="."
             android:popupKeyboard="@xml/popup_punctuation"
             android:keyWidth="10%p"
@@ -351,7 +323,7 @@
         android:rowEdgeFlags="bottom"
     >
         <Key
-            android:codes="-2"
+            android:codes="@integer/key_symbol"
             android:keyLabel="@string/label_symbol_key"
             android:keyWidth="15%p"
             android:keyEdgeFlags="left"
@@ -369,14 +341,14 @@
             android:keyWidth="10%p"
             android:isModifier="true" />
         <Key
-            android:codes="32"
+            android:codes="@integer/key_space"
             android:keyIcon="@drawable/sym_keyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:keyWidth="30%p"
             android:isRepeatable="true"
             android:isModifier="true" />
         <Key
-            android:codes="9"
+            android:codes="@integer/key_tab"
             android:keyIcon="@drawable/sym_keyboard_tab"
             android:iconPreview="@drawable/sym_keyboard_feedback_tab"
             android:keyWidth="10%p"
@@ -387,7 +359,7 @@
             android:keyWidth="10%p"
             android:isModifier="true" />
         <Key
-            android:codes="10"
+            android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_keyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
             android:keyWidth="15%p"
diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml
index dc653afbe..332582962 100644
--- a/java/res/xml-sv/kbd_qwerty_black.xml
+++ b/java/res/xml-sv/kbd_qwerty_black.xml
@@ -35,50 +35,40 @@
 >
     <Row>
         <Key
-            android:codes="113"
             android:keyLabel="q"
             android:keyWidth="8.75%p"
             android:keyEdgeFlags="left" />
         <Key
-            android:codes="119"
             android:keyLabel="w" />
         <Key
-            android:codes="101"
             android:keyLabel="e"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="éèêëę€" />
         <Key
-            android:codes="114"
             android:keyLabel="r"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ř" />
         <Key
-            android:codes="116"
             android:keyLabel="t"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ťþ" />
         <Key
-            android:codes="121"
             android:keyLabel="y"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ýÿü" />
         <Key
-            android:codes="117"
             android:keyLabel="u"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="úùûū" />
         <Key
-            android:codes="105"
             android:keyLabel="i"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="íìîï" />
         <Key
-            android:codes="111"
             android:keyLabel="o"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="óòôõ" />
         <Key
-            android:codes="112"
             android:keyLabel="p" />
         <Key
             android:keyLabel="å"
@@ -87,39 +77,30 @@
     </Row>
     <Row>
         <Key
-            android:codes="97"
             android:keyLabel="a"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="áàâąã"
             android:keyWidth="8.75%p"
             android:keyEdgeFlags="left" />
         <Key
-            android:codes="115"
             android:keyLabel="s"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="śšşß" />
         <Key
-            android:codes="100"
             android:keyLabel="d"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ðď" />
         <Key
-            android:codes="102"
             android:keyLabel="f" />
         <Key
-            android:codes="103"
             android:keyLabel="g" />
         <Key
-            android:codes="104"
             android:keyLabel="h" />
         <Key
-            android:codes="106"
             android:keyLabel="j" />
         <Key
-            android:codes="107"
             android:keyLabel="k" />
         <Key
-            android:codes="108"
             android:keyLabel="l"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ł" />
@@ -138,7 +119,7 @@
         android:keyWidth="10%p"
     >
         <Key
-            android:codes="-1"
+            android:codes="@integer/key_shift"
             android:keyIcon="@drawable/sym_bkeyboard_shift"
             android:keyWidth="15%p"
             android:isModifier="true"
@@ -146,36 +127,29 @@
             android:isSticky="true"
             android:keyEdgeFlags="left" />
         <Key
-            android:codes="122"
             android:keyLabel="z"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="źžż" />
         <Key
-            android:codes="120"
             android:keyLabel="x" />
         <Key
-            android:codes="99"
             android:keyLabel="c"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="çćč" />
         <Key
-            android:codes="118"
             android:keyLabel="v"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="w" />
         <Key
-            android:codes="98"
             android:keyLabel="b" />
         <Key
-            android:codes="110"
             android:keyLabel="n"
             android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="ńñň" />
         <Key
-            android:codes="109"
             android:keyLabel="m" />
         <Key
-            android:codes="-5"
+            android:codes="@integer/key_delete"
             android:keyIcon="@drawable/sym_bkeyboard_delete"
             android:keyWidth="15%p"
             android:keyEdgeFlags="right"
@@ -187,7 +161,7 @@
         android:rowEdgeFlags="bottom"
     >
         <Key
-            android:codes="-2"
+            android:codes="@integer/key_symbol"
             android:keyLabel="@string/label_symbol_key"
             android:keyWidth="15%p"
             android:keyEdgeFlags="left" />
@@ -202,18 +176,17 @@
             android:iconPreview="@drawable/sym_keyboard_feedback_mic"
             android:keyWidth="10%p" />
         <Key
-            android:codes="32"
+            android:codes="@integer/key_space"
             android:keyIcon="@drawable/sym_bkeyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:keyWidth="30%p"
             android:isRepeatable="true" />
         <Key
-            android:codes="46"
             android:keyLabel="."
             android:popupKeyboard="@xml/popup_punctuation"
             android:keyWidth="10%p" />
         <Key
-            android:codes="10"
+            android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
             android:keyWidth="25%p"
@@ -224,7 +197,7 @@
         android:rowEdgeFlags="bottom"
     >
         <Key
-            android:codes="-2"
+            android:codes="@integer/key_symbol"
             android:keyLabel="@string/label_symbol_key"
             android:keyWidth="15%p"
             android:keyEdgeFlags="left" />
@@ -237,7 +210,7 @@
             android:keyLabel="/"
             android:keyWidth="10%p" />
         <Key
-            android:codes="32"
+            android:codes="@integer/key_space"
             android:keyIcon="@drawable/sym_bkeyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:keyWidth="30%p"
@@ -247,7 +220,7 @@
             android:popupKeyboard="@xml/popup_punctuation"
             android:keyWidth="10%p" />
         <Key
-            android:codes="10"
+            android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
             android:keyWidth="25%p"
@@ -258,7 +231,7 @@
         android:rowEdgeFlags="bottom"
     >
         <Key
-            android:codes="-2"
+            android:codes="@integer/key_symbol"
             android:keyLabel="@string/label_symbol_key"
             android:keyWidth="15%p"
             android:keyEdgeFlags="left" />
@@ -270,7 +243,7 @@
         <Key
             android:keyLabel="\@" />
         <Key
-            android:codes="32"
+            android:codes="@integer/key_space"
             android:keyIcon="@drawable/sym_bkeyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:keyWidth="30%p"
@@ -279,7 +252,7 @@
             android:keyLabel="."
             android:popupKeyboard="@xml/popup_punctuation" />
         <Key
-            android:codes="10"
+            android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
             android:keyWidth="25%p"
@@ -290,7 +263,7 @@
         android:rowEdgeFlags="bottom"
     >
         <Key
-            android:codes="-2"
+            android:codes="@integer/key_symbol"
             android:keyLabel="@string/label_symbol_key"
             android:keyWidth="15%p"
             android:keyEdgeFlags="left" />
@@ -305,13 +278,12 @@
             android:iconPreview="@drawable/sym_keyboard_feedback_mic"
             android:keyWidth="10%p" />
         <Key
-            android:codes="32"
+            android:codes="@integer/key_space"
             android:keyIcon="@drawable/sym_bkeyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:keyWidth="30%p"
             android:isRepeatable="true" />
         <Key
-            android:codes="46"
             android:keyLabel="."
             android:popupKeyboard="@xml/popup_punctuation"
             android:keyWidth="10%p" />
@@ -327,7 +299,7 @@
         android:rowEdgeFlags="bottom"
     >
         <Key
-            android:codes="-2"
+            android:codes="@integer/key_symbol"
             android:keyLabel="@string/label_symbol_key"
             android:keyWidth="15%p"
             android:keyEdgeFlags="left" />
@@ -342,13 +314,13 @@
             android:iconPreview="@drawable/sym_keyboard_feedback_mic"
             android:keyWidth="10%p" />
         <Key
-            android:codes="32"
+            android:codes="@integer/key_space"
             android:keyIcon="@drawable/sym_bkeyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:keyWidth="30%p"
             android:isRepeatable="true" />
         <Key
-            android:codes="9"
+            android:codes="@integer/key_tab"
             android:keyIcon="@drawable/sym_bkeyboard_tab"
             android:iconPreview="@drawable/sym_keyboard_feedback_tab"
             android:keyWidth="10%p" />
@@ -357,10 +329,10 @@
             android:popupKeyboard="@xml/popup_punctuation"
             android:keyWidth="10%p" />
         <Key
-            android:codes="10"
+            android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
             android:keyWidth="15%p"
             android:keyEdgeFlags="right" />
     </Row>
-</Keyboard>
\ No newline at end of file
+</Keyboard>