Remove multi-tap feature
Change-Id: Ife44b3f9d420d77d2cfb51044a8356f02ed63e8b
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 549c2ae..9759e0e 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -94,8 +94,8 @@
</declare-styleable>
<declare-styleable name="Keyboard_Key">
- <!-- The unicode value or comma-separated values that this key outputs. -->
- <attr name="codes" format="integer|string" />
+ <!-- The unicode value that this key outputs. -->
+ <attr name="code" format="integer" />
<!-- The characters to display in the popup keyboard. -->
<attr name="popupCharacters" format="string" />
<!-- Maximum column of popup keyboard -->
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 4187c31..1225304 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -41,7 +41,6 @@
<integer name="config_keyboard_grid_height">16</integer>
<integer name="config_long_press_key_timeout">400</integer>
<integer name="config_long_press_shift_key_timeout">1200</integer>
- <integer name="config_multi_tap_key_timeout">800</integer>
<string name="config_text_size_of_language_on_spacebar">small</string>
<integer name="config_max_popup_keyboard_column">9</integer>
<!-- Whether or not auto-correction should be enabled by default -->
diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml
index 6c1df0b..eb37580 100644
--- a/java/res/xml-xlarge/kbd_key_styles.xml
+++ b/java/res/xml-xlarge/kbd_key_styles.xml
@@ -31,7 +31,7 @@
latin:isModifier="true" />
<key-style
latin:styleName="shiftKeyStyle"
- latin:codes="@integer/key_shift"
+ latin:code="@integer/key_shift"
latin:keyIcon="@drawable/sym_keyboard_shift_holo"
latin:shiftedIcon="@drawable/sym_keyboard_shift_locked_holo"
latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
@@ -39,25 +39,25 @@
latin:isSticky="true" />
<key-style
latin:styleName="deleteKeyStyle"
- latin:codes="@integer/key_delete"
+ latin:code="@integer/key_delete"
latin:keyIcon="@drawable/sym_keyboard_delete_holo"
latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
<key-style
latin:styleName="returnKeyStyle"
- latin:codes="@integer/key_return"
+ latin:code="@integer/key_return"
latin:keyIcon="@drawable/sym_keyboard_return_holo"
latin:iconPreview="@drawable/sym_keyboard_feedback_return"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space_holo"
latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
<key-style
latin:styleName="nonSpecialBackgroundSpaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space_holo"
latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
<key-style
@@ -69,7 +69,7 @@
latin:maxPopupKeyboardColumn="5" />
<key-style
latin:styleName="micKeyStyle"
- latin:codes="@integer/key_voice"
+ latin:code="@integer/key_voice"
latin:keyIcon="@drawable/sym_keyboard_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
latin:parentStyle="functionalKeyStyle" />
@@ -81,7 +81,7 @@
latin:styleName="functionalKeyStyle" />
<key-style
latin:styleName="shiftKeyStyle"
- latin:codes="@integer/key_shift"
+ latin:code="@integer/key_shift"
latin:keyIcon="@drawable/sym_bkeyboard_shift"
latin:shiftedIcon="@drawable/sym_bkeyboard_shift_locked"
latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
@@ -89,25 +89,25 @@
latin:isSticky="true" />
<key-style
latin:styleName="deleteKeyStyle"
- latin:codes="@integer/key_delete"
+ latin:code="@integer/key_delete"
latin:keyIcon="@drawable/sym_bkeyboard_delete"
latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
latin:parentStyle="functionalKeyStyle"
latin:isRepeatable="true" />
<key-style
latin:styleName="returnKeyStyle"
- latin:codes="@integer/key_return"
+ latin:code="@integer/key_return"
latin:keyIcon="@drawable/sym_bkeyboard_return"
latin:iconPreview="@drawable/sym_keyboard_feedback_return"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_bkeyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
<key-style
latin:styleName="nonSpecialBackgroundSpaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_bkeyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
<key-style
@@ -119,7 +119,7 @@
latin:maxPopupKeyboardColumn="5" />
<key-style
latin:styleName="micKeyStyle"
- latin:codes="@integer/key_voice"
+ latin:code="@integer/key_voice"
latin:keyIcon="@drawable/sym_bkeyboard_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
latin:parentStyle="functionalKeyStyle" />
@@ -127,25 +127,25 @@
</switch>
<key-style
latin:styleName="tabKeyStyle"
- latin:codes="@integer/key_tab"
+ latin:code="@integer/key_tab"
latin:keyLabel="@string/label_tab_key"
latin:keyLabelOption="fontNormal"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
latin:keyLabelOption="fontNormal"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="toAlphaKeyStyle"
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_alpha_key"
latin:keyLabelOption="fontNormal"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="moreKeyStyle"
- latin:codes="@integer/key_shift"
+ latin:code="@integer/key_shift"
latin:keyLabel="@string/label_more_key"
latin:keyLabelOption="fontNormal"
latin:parentStyle="functionalKeyStyle"
diff --git a/java/res/xml-xlarge/kbd_numkey_styles.xml b/java/res/xml-xlarge/kbd_numkey_styles.xml
index adf45a8..3c62cb0 100644
--- a/java/res/xml-xlarge/kbd_numkey_styles.xml
+++ b/java/res/xml-xlarge/kbd_numkey_styles.xml
@@ -27,60 +27,60 @@
>
<key-style
latin:styleName="num0KeyStyle"
- latin:codes="48"
+ latin:code="48"
latin:keyIcon="@drawable/sym_keyboard_num0_holo" />
<key-style
latin:styleName="num1KeyStyle"
- latin:codes="49"
+ latin:code="49"
latin:keyIcon="@drawable/sym_keyboard_num1_holo" />
<key-style
latin:styleName="num2KeyStyle"
- latin:codes="50"
+ latin:code="50"
latin:keyIcon="@drawable/sym_keyboard_num2_holo" />
<key-style
latin:styleName="num3KeyStyle"
- latin:codes="51"
+ latin:code="51"
latin:keyIcon="@drawable/sym_keyboard_num3_holo" />
<key-style
latin:styleName="num4KeyStyle"
- latin:codes="52"
+ latin:code="52"
latin:keyIcon="@drawable/sym_keyboard_num4_holo" />
<key-style
latin:styleName="num5KeyStyle"
- latin:codes="53"
+ latin:code="53"
latin:keyIcon="@drawable/sym_keyboard_num5_holo" />
<key-style
latin:styleName="num6KeyStyle"
- latin:codes="54"
+ latin:code="54"
latin:keyIcon="@drawable/sym_keyboard_num6_holo" />
<key-style
latin:styleName="num7KeyStyle"
- latin:codes="55"
+ latin:code="55"
latin:keyIcon="@drawable/sym_keyboard_num7_holo" />
<key-style
latin:styleName="num8KeyStyle"
- latin:codes="56"
+ latin:code="56"
latin:keyIcon="@drawable/sym_keyboard_num8_holo" />
<key-style
latin:styleName="num9KeyStyle"
- latin:codes="57"
+ latin:code="57"
latin:keyIcon="@drawable/sym_keyboard_num9_holo" />
<key-style
latin:styleName="numStarKeyStyle"
- latin:codes="42"
+ latin:code="42"
latin:keyIcon="@drawable/sym_keyboard_numbstar_holo" />
<key-style
latin:styleName="numPoundKeyStyle"
- latin:codes="35"
+ latin:code="35"
latin:keyIcon="@drawable/sym_keyboard_numbpound_holo" />
<key-style
latin:styleName="numAltKeyStyle"
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyIcon="@drawable/sym_keyboard_numalt"
latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" />
<key-style
latin:styleName="numSpaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space_holo"
latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
</case>
@@ -89,60 +89,60 @@
>
<key-style
latin:styleName="num0KeyStyle"
- latin:codes="48"
+ latin:code="48"
latin:keyIcon="@drawable/sym_bkeyboard_num0" />
<key-style
latin:styleName="num1KeyStyle"
- latin:codes="49"
+ latin:code="49"
latin:keyIcon="@drawable/sym_bkeyboard_num1" />
<key-style
latin:styleName="num2KeyStyle"
- latin:codes="50"
+ latin:code="50"
latin:keyIcon="@drawable/sym_bkeyboard_num2" />
<key-style
latin:styleName="num3KeyStyle"
- latin:codes="51"
+ latin:code="51"
latin:keyIcon="@drawable/sym_bkeyboard_num3" />
<key-style
latin:styleName="num4KeyStyle"
- latin:codes="52"
+ latin:code="52"
latin:keyIcon="@drawable/sym_bkeyboard_num4" />
<key-style
latin:styleName="num5KeyStyle"
- latin:codes="53"
+ latin:code="53"
latin:keyIcon="@drawable/sym_bkeyboard_num5" />
<key-style
latin:styleName="num6KeyStyle"
- latin:codes="54"
+ latin:code="54"
latin:keyIcon="@drawable/sym_bkeyboard_num6" />
<key-style
latin:styleName="num7KeyStyle"
- latin:codes="55"
+ latin:code="55"
latin:keyIcon="@drawable/sym_bkeyboard_num7" />
<key-style
latin:styleName="num8KeyStyle"
- latin:codes="56"
+ latin:code="56"
latin:keyIcon="@drawable/sym_bkeyboard_num8" />
<key-style
latin:styleName="num9KeyStyle"
- latin:codes="57"
+ latin:code="57"
latin:keyIcon="@drawable/sym_bkeyboard_num9" />
<key-style
latin:styleName="numStarKeyStyle"
- latin:codes="42"
+ latin:code="42"
latin:keyIcon="@drawable/sym_bkeyboard_numstar" />
<key-style
latin:styleName="numPoundKeyStyle"
- latin:codes="35"
+ latin:code="35"
latin:keyIcon="@drawable/sym_bkeyboard_numpound" />
<key-style
latin:styleName="numAltKeyStyle"
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyIcon="@drawable/sym_bkeyboard_numalt"
latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" />
<key-style
latin:styleName="numSpaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_bkeyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
</case>
diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml
index 66f6020..45c2983 100644
--- a/java/res/xml-xlarge/kbd_phone.xml
+++ b/java/res/xml-xlarge/kbd_phone.xml
@@ -44,11 +44,11 @@
<Spacer
latin:horizontalGap="8.470%p" />
<Key
- latin:codes="45"
+ latin:code="45"
latin:keyLabel=" - "
latin:keyWidth="8.042%p" />
<Key
- latin:codes="43"
+ latin:code="43"
latin:keyLabel=" + "
latin:keyWidth="8.042%p" />
<Spacer
@@ -75,11 +75,11 @@
<Spacer
latin:horizontalGap="8.470%p" />
<Key
- latin:codes="44"
+ latin:code="44"
latin:keyLabel=" , "
latin:keyWidth="8.042%p" />
<Key
- latin:codes="46"
+ latin:code="46"
latin:keyLabel=" . "
latin:keyWidth="8.042%p" />
<Spacer
@@ -105,11 +105,11 @@
<Spacer
latin:horizontalGap="20.427%p" />
<Key
- latin:codes="40"
+ latin:code="40"
latin:keyLabel=" ( "
latin:keyWidth="8.042%p" />
<Key
- latin:codes="41"
+ latin:code="41"
latin:keyLabel=" ) "
latin:keyWidth="8.042%p" />
<Spacer
diff --git a/java/res/xml-xlarge/kbd_phone_symbols.xml b/java/res/xml-xlarge/kbd_phone_symbols.xml
index 8c0df03..891ceac 100644
--- a/java/res/xml-xlarge/kbd_phone_symbols.xml
+++ b/java/res/xml-xlarge/kbd_phone_symbols.xml
@@ -42,15 +42,15 @@
<Spacer
latin:horizontalGap="4.458%p" />
<Key
- latin:codes="45"
+ latin:code="45"
latin:keyLabel=" - "
latin:keyWidth="8.042%p" />
<Key
- latin:codes="43"
+ latin:code="43"
latin:keyLabel=" + "
latin:keyWidth="8.042%p" />
<Key
- latin:codes="44"
+ latin:code="44"
latin:keyLabel="@string/label_pause_key"
latin:keyWidth="8.042%p" />
<!-- To match one character label size with "Tab" and "Pause, I placed spaces around the
@@ -77,15 +77,15 @@
<Spacer
latin:horizontalGap="4.458%p" />
<Key
- latin:codes="44"
+ latin:code="44"
latin:keyLabel=" , "
latin:keyWidth="8.042%p" />
<Key
- latin:codes="46"
+ latin:code="46"
latin:keyLabel=" . "
latin:keyWidth="8.042%p" />
<Key
- latin:codes="59"
+ latin:code="59"
latin:keyLabel="@string/label_wait_key"
latin:keyWidth="8.042%p" />
<!-- To match one character label size with "More" and "Wait", I placed spaces around the
@@ -113,15 +113,15 @@
<Spacer
latin:horizontalGap="16.406%p" />
<Key
- latin:codes="40"
+ latin:code="40"
latin:keyLabel=" ( "
latin:keyWidth="8.042%p" />
<Key
- latin:codes="41"
+ latin:code="41"
latin:keyLabel=" ) "
latin:keyWidth="8.042%p" />
<Key
- latin:codes="78"
+ latin:code="78"
latin:keyLabel=" N "
latin:keyWidth="8.042%p" />
<Spacer
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index 3b6df73..3b35f35 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -31,7 +31,7 @@
latin:isModifier="true" />
<key-style
latin:styleName="shiftKeyStyle"
- latin:codes="@integer/key_shift"
+ latin:code="@integer/key_shift"
latin:keyIcon="@drawable/sym_keyboard_shift"
latin:shiftedIcon="@drawable/sym_keyboard_shift_locked"
latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
@@ -39,7 +39,7 @@
latin:isSticky="true" />
<key-style
latin:styleName="deleteKeyStyle"
- latin:codes="@integer/key_delete"
+ latin:code="@integer/key_delete"
latin:keyIcon="@drawable/sym_keyboard_delete"
latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
latin:parentStyle="functionalKeyStyle"
@@ -54,7 +54,7 @@
>
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyIcon="@drawable/sym_keyboard_123_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"
latin:parentStyle="functionalKeyStyle" />
@@ -62,32 +62,32 @@
<default>
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
latin:parentStyle="functionalKeyStyle" />
</default>
</switch>
<key-style
latin:styleName="settingsKeyStyle"
- latin:codes="@integer/key_settings"
+ latin:code="@integer/key_settings"
latin:keyIcon="@drawable/sym_keyboard_settings"
latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="tabKeyStyle"
- latin:codes="@integer/key_tab"
+ latin:code="@integer/key_tab"
latin:keyIcon="@drawable/sym_keyboard_tab"
latin:iconPreview="@drawable/sym_keyboard_feedback_tab"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="micKeyStyle"
- latin:codes="@integer/key_voice"
+ latin:code="@integer/key_voice"
latin:keyIcon="@drawable/sym_keyboard_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
latin:keyHintIcon="@drawable/hint_popup"
@@ -97,7 +97,7 @@
which is laid out as normal letter key. -->
<key-style
latin:styleName="nonSpecialBackgroundTabKeyStyle"
- latin:codes="@integer/key_tab"
+ latin:code="@integer/key_tab"
latin:keyIcon="@drawable/sym_keyboard_tab"
latin:iconPreview="@drawable/sym_keyboard_feedback_tab" />
</case>
@@ -108,7 +108,7 @@
latin:styleName="functionalKeyStyle" />
<key-style
latin:styleName="shiftKeyStyle"
- latin:codes="@integer/key_shift"
+ latin:code="@integer/key_shift"
latin:keyIcon="@drawable/sym_bkeyboard_shift"
latin:shiftedIcon="@drawable/sym_bkeyboard_shift_locked"
latin:iconPreview="@drawable/sym_keyboard_feedback_shift"
@@ -116,7 +116,7 @@
latin:isSticky="true" />
<key-style
latin:styleName="deleteKeyStyle"
- latin:codes="@integer/key_delete"
+ latin:code="@integer/key_delete"
latin:keyIcon="@drawable/sym_bkeyboard_delete"
latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
latin:parentStyle="functionalKeyStyle"
@@ -131,7 +131,7 @@
>
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyIcon="@drawable/sym_bkeyboard_123_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"
latin:parentStyle="functionalKeyStyle" />
@@ -139,32 +139,32 @@
<default>
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
latin:parentStyle="functionalKeyStyle" />
</default>
</switch>
<key-style
latin:styleName="settingsKeyStyle"
- latin:codes="@integer/key_settings"
+ latin:code="@integer/key_settings"
latin:keyIcon="@drawable/sym_bkeyboard_settings"
latin:iconPreview="@drawable/sym_keyboard_feedback_settings"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_bkeyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="tabKeyStyle"
- latin:codes="@integer/key_tab"
+ latin:code="@integer/key_tab"
latin:keyIcon="@drawable/sym_bkeyboard_tab"
latin:iconPreview="@drawable/sym_keyboard_feedback_tab"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="micKeyStyle"
- latin:codes="@integer/key_voice"
+ latin:code="@integer/key_voice"
latin:keyIcon="@drawable/sym_bkeyboard_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_mic"
latin:keyHintIcon="@drawable/hint_popup"
@@ -174,7 +174,7 @@
which is laid out as normal letter key. -->
<key-style
latin:styleName="nonSpecialBackgroundTabKeyStyle"
- latin:codes="@integer/key_tab"
+ latin:code="@integer/key_tab"
latin:keyIcon="@drawable/sym_bkeyboard_tab"
latin:iconPreview="@drawable/sym_keyboard_feedback_tab" />
</case>
@@ -186,7 +186,7 @@
>
<key-style
latin:styleName="returnKeyStyle"
- latin:codes="@integer/key_return"
+ latin:code="@integer/key_return"
latin:keyLabel="@string/label_go_key"
latin:parentStyle="functionalKeyStyle" />
</case>
@@ -195,7 +195,7 @@
>
<key-style
latin:styleName="returnKeyStyle"
- latin:codes="@integer/key_return"
+ latin:code="@integer/key_return"
latin:keyLabel="@string/label_next_key"
latin:parentStyle="functionalKeyStyle" />
</case>
@@ -204,7 +204,7 @@
>
<key-style
latin:styleName="returnKeyStyle"
- latin:codes="@integer/key_return"
+ latin:code="@integer/key_return"
latin:keyLabel="@string/label_done_key"
latin:parentStyle="functionalKeyStyle" />
</case>
@@ -213,7 +213,7 @@
>
<key-style
latin:styleName="returnKeyStyle"
- latin:codes="@integer/key_return"
+ latin:code="@integer/key_return"
latin:keyLabel="@string/label_send_key"
latin:parentStyle="functionalKeyStyle" />
</case>
@@ -226,7 +226,7 @@
>
<key-style
latin:styleName="returnKeyStyle"
- latin:codes="@integer/key_return"
+ latin:code="@integer/key_return"
latin:keyIcon="@drawable/sym_keyboard_search"
latin:iconPreview="@drawable/sym_keyboard_feedback_search"
latin:parentStyle="functionalKeyStyle" />
@@ -236,7 +236,7 @@
>
<key-style
latin:styleName="returnKeyStyle"
- latin:codes="@integer/key_return"
+ latin:code="@integer/key_return"
latin:keyIcon="@drawable/sym_bkeyboard_search"
latin:iconPreview="@drawable/sym_keyboard_feedback_search"
latin:parentStyle="functionalKeyStyle" />
@@ -250,7 +250,7 @@
>
<key-style
latin:styleName="returnKeyStyle"
- latin:codes="@integer/key_return"
+ latin:code="@integer/key_return"
latin:keyIcon="@drawable/sym_keyboard_return"
latin:iconPreview="@drawable/sym_keyboard_feedback_return"
latin:parentStyle="functionalKeyStyle" />
@@ -260,7 +260,7 @@
>
<key-style
latin:styleName="returnKeyStyle"
- latin:codes="@integer/key_return"
+ latin:code="@integer/key_return"
latin:keyIcon="@drawable/sym_bkeyboard_return"
latin:iconPreview="@drawable/sym_keyboard_feedback_return"
latin:parentStyle="functionalKeyStyle" />
@@ -270,12 +270,12 @@
</switch>
<key-style
latin:styleName="toAlphaKeyStyle"
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_alpha_key"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="altKeyStyle"
- latin:codes="@integer/key_shift"
+ latin:code="@integer/key_shift"
latin:keyLabel="@string/label_alt_key"
latin:parentStyle="functionalKeyStyle"
latin:isSticky="true" />
diff --git a/java/res/xml/kbd_number.xml b/java/res/xml/kbd_number.xml
index f4a5def..f4fe840 100644
--- a/java/res/xml/kbd_number.xml
+++ b/java/res/xml/kbd_number.xml
@@ -37,7 +37,7 @@
>
<key-style
latin:styleName="numSpaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
</case>
@@ -46,7 +46,7 @@
>
<key-style
latin:styleName="numSpaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_bkeyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
</case>
diff --git a/java/res/xml/kbd_numkey_styles.xml b/java/res/xml/kbd_numkey_styles.xml
index 006476d..2f9ae32 100644
--- a/java/res/xml/kbd_numkey_styles.xml
+++ b/java/res/xml/kbd_numkey_styles.xml
@@ -27,60 +27,60 @@
>
<key-style
latin:styleName="num0KeyStyle"
- latin:codes="48"
+ latin:code="48"
latin:keyIcon="@drawable/sym_keyboard_num0" />
<key-style
latin:styleName="num1KeyStyle"
- latin:codes="49"
+ latin:code="49"
latin:keyIcon="@drawable/sym_keyboard_num1" />
<key-style
latin:styleName="num2KeyStyle"
- latin:codes="50"
+ latin:code="50"
latin:keyIcon="@drawable/sym_keyboard_num2" />
<key-style
latin:styleName="num3KeyStyle"
- latin:codes="51"
+ latin:code="51"
latin:keyIcon="@drawable/sym_keyboard_num3" />
<key-style
latin:styleName="num4KeyStyle"
- latin:codes="52"
+ latin:code="52"
latin:keyIcon="@drawable/sym_keyboard_num4" />
<key-style
latin:styleName="num5KeyStyle"
- latin:codes="53"
+ latin:code="53"
latin:keyIcon="@drawable/sym_keyboard_num5" />
<key-style
latin:styleName="num6KeyStyle"
- latin:codes="54"
+ latin:code="54"
latin:keyIcon="@drawable/sym_keyboard_num6" />
<key-style
latin:styleName="num7KeyStyle"
- latin:codes="55"
+ latin:code="55"
latin:keyIcon="@drawable/sym_keyboard_num7" />
<key-style
latin:styleName="num8KeyStyle"
- latin:codes="56"
+ latin:code="56"
latin:keyIcon="@drawable/sym_keyboard_num8" />
<key-style
latin:styleName="num9KeyStyle"
- latin:codes="57"
+ latin:code="57"
latin:keyIcon="@drawable/sym_keyboard_num9" />
<key-style
latin:styleName="numStarKeyStyle"
- latin:codes="42"
+ latin:code="42"
latin:keyIcon="@drawable/sym_keyboard_numstar" />
<key-style
latin:styleName="numPoundKeyStyle"
- latin:codes="35"
+ latin:code="35"
latin:keyIcon="@drawable/sym_keyboard_numpound" />
<key-style
latin:styleName="numAltKeyStyle"
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyIcon="@drawable/sym_keyboard_numalt"
latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" />
<key-style
latin:styleName="numSpaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_keyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
</case>
@@ -89,60 +89,60 @@
>
<key-style
latin:styleName="num0KeyStyle"
- latin:codes="48"
+ latin:code="48"
latin:keyIcon="@drawable/sym_bkeyboard_num0" />
<key-style
latin:styleName="num1KeyStyle"
- latin:codes="49"
+ latin:code="49"
latin:keyIcon="@drawable/sym_bkeyboard_num1" />
<key-style
latin:styleName="num2KeyStyle"
- latin:codes="50"
+ latin:code="50"
latin:keyIcon="@drawable/sym_bkeyboard_num2" />
<key-style
latin:styleName="num3KeyStyle"
- latin:codes="51"
+ latin:code="51"
latin:keyIcon="@drawable/sym_bkeyboard_num3" />
<key-style
latin:styleName="num4KeyStyle"
- latin:codes="52"
+ latin:code="52"
latin:keyIcon="@drawable/sym_bkeyboard_num4" />
<key-style
latin:styleName="num5KeyStyle"
- latin:codes="53"
+ latin:code="53"
latin:keyIcon="@drawable/sym_bkeyboard_num5" />
<key-style
latin:styleName="num6KeyStyle"
- latin:codes="54"
+ latin:code="54"
latin:keyIcon="@drawable/sym_bkeyboard_num6" />
<key-style
latin:styleName="num7KeyStyle"
- latin:codes="55"
+ latin:code="55"
latin:keyIcon="@drawable/sym_bkeyboard_num7" />
<key-style
latin:styleName="num8KeyStyle"
- latin:codes="56"
+ latin:code="56"
latin:keyIcon="@drawable/sym_bkeyboard_num8" />
<key-style
latin:styleName="num9KeyStyle"
- latin:codes="57"
+ latin:code="57"
latin:keyIcon="@drawable/sym_bkeyboard_num9" />
<key-style
latin:styleName="numStarKeyStyle"
- latin:codes="42"
+ latin:code="42"
latin:keyIcon="@drawable/sym_bkeyboard_numstar" />
<key-style
latin:styleName="numPoundKeyStyle"
- latin:codes="35"
+ latin:code="35"
latin:keyIcon="@drawable/sym_bkeyboard_numpound" />
<key-style
latin:styleName="numAltKeyStyle"
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyIcon="@drawable/sym_bkeyboard_numalt"
latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" />
<key-style
latin:styleName="numSpaceKeyStyle"
- latin:codes="@integer/key_space"
+ latin:code="@integer/key_space"
latin:keyIcon="@drawable/sym_bkeyboard_space"
latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
</case>
diff --git a/java/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml
index 1997a75..67cd330 100644
--- a/java/res/xml/kbd_phone_symbols.xml
+++ b/java/res/xml/kbd_phone_symbols.xml
@@ -56,7 +56,7 @@
<!-- Pause is a comma. Check PhoneNumberUtils.java to see if this
has changed. -->
<Key
- latin:codes="44"
+ latin:code="44"
latin:keyLabel="Pause" />
<Key
latin:keyLabel="," />
@@ -72,7 +72,7 @@
latin:keyEdgeFlags="left" />
<!-- Wait is a semicolon. -->
<Key
- latin:codes="59"
+ latin:code="59"
latin:keyLabel="Wait" />
<Key
latin:keyStyle="numPoundKeyStyle" />
@@ -85,7 +85,7 @@
latin:rowEdgeFlags="bottom"
>
<Key
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_numeric_key"
latin:keyEdgeFlags="left" />
<Key
diff --git a/java/res/xml/kbd_qwerty_black_symbol.xml b/java/res/xml/kbd_qwerty_black_symbol.xml
index fe6b3a6..6e45c12 100644
--- a/java/res/xml/kbd_qwerty_black_symbol.xml
+++ b/java/res/xml/kbd_qwerty_black_symbol.xml
@@ -34,7 +34,7 @@
latin:hasVoiceKey="false"
>
<Key
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyIcon="@drawable/sym_bkeyboard_123_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"
latin:keyWidth="20%p"
@@ -43,7 +43,7 @@
</case>
<default>
<Key
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
latin:keyWidth="20%p"
latin:isModifier="true"
@@ -63,7 +63,7 @@
latin:hasVoiceKey="false"
>
<Key
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyIcon="@drawable/sym_bkeyboard_123_mic"
latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"
latin:keyWidth="15%p"
@@ -72,7 +72,7 @@
</case>
<default>
<Key
- latin:codes="@integer/key_switch_alpha_symbol"
+ latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
latin:keyWidth="15%p"
latin:isModifier="true"