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
diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml
index e4bcc14..36c7b7c 100644
--- a/java/res/xml-nb/kbd_qwerty.xml
+++ b/java/res/xml-nb/kbd_qwerty.xml
@@ -33,50 +33,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="å"
@@ -85,39 +75,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="ł" />
@@ -134,7 +115,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"
@@ -142,36 +123,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"
@@ -184,7 +158,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,20 +176,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"
@@ -227,7 +200,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"
@@ -243,7 +216,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"
@@ -255,7 +228,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"
@@ -267,7 +240,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"
@@ -282,7 +255,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"
@@ -293,7 +266,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"
@@ -305,7 +278,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"
@@ -323,14 +296,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"
@@ -348,7 +320,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"
@@ -366,14 +338,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"
@@ -384,7 +356,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"