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/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
old mode 100755
new mode 100644
index 5580b2b..48a93ad
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -30,53 +30,43 @@
>
<Row>
<Key
- android:codes="113"
android:keyLabel="q"
android:keyEdgeFlags="left"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_q" />
<Key
- android:codes="119"
android:keyLabel="w"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_w" />
<Key
- android:codes="101"
android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_e" />
<Key
- android:codes="114"
android:keyLabel="r"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_r" />
<Key
- android:codes="116"
android:keyLabel="t"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_t" />
<Key
- android:codes="121"
android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_y" />
<Key
- android:codes="117"
android:keyLabel="u"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_u" />
<Key
- android:codes="105"
android:keyLabel="i"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_i" />
<Key
- android:codes="111"
android:keyLabel="o"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_o" />
<Key
- android:codes="112"
android:keyLabel="p"
android:keyEdgeFlags="right"
android:popupKeyboard="@xml/kbd_popup_template"
@@ -84,41 +74,32 @@
</Row>
<Row>
<Key
- android:codes="97"
android:keyLabel="a"
android:horizontalGap="5%p"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_a"
android:keyEdgeFlags="left" />
<Key
- android:codes="115"
android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_s" />
<Key
- android:codes="100"
android:keyLabel="d"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_d" />
<Key
- android:codes="102"
android:keyLabel="f" />
<Key
- android:codes="103"
android:keyLabel="g"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_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="@string/alternates_for_l"
@@ -126,7 +107,7 @@
</Row>
<Row>
<Key
- android:codes="-1"
+ android:codes="@integer/key_shift"
android:keyIcon="@drawable/sym_keyboard_shift"
android:keyWidth="15%p"
android:isModifier="true"
@@ -134,34 +115,27 @@
android:isSticky="true"
android:keyEdgeFlags="left" />
<Key
- android:codes="122"
android:keyLabel="z"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_z" />
<Key
- android:codes="120"
android:keyLabel="x" />
<Key
- android:codes="99"
android:keyLabel="c"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_c" />
<Key
- android:codes="118"
android:keyLabel="v" />
<Key
- android:codes="98"
android:keyLabel="b" />
<Key
- android:codes="110"
android:keyLabel="n"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_n" />
<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"
@@ -174,7 +148,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"
@@ -192,20 +166,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"
@@ -217,7 +190,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"
@@ -233,7 +206,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"
@@ -245,7 +218,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"
@@ -257,7 +230,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"
@@ -272,7 +245,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"
@@ -283,7 +256,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"
@@ -295,7 +268,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"
@@ -313,14 +286,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"
@@ -338,7 +310,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"
@@ -356,14 +328,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"
@@ -374,7 +346,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"