Introduce KeyboardCodesSet.java and remove keycodes.xml
Change-Id: Icfd6d06f47425aa037682d22c895548ba6f047d8
diff --git a/java/res/values-ar/keycodes.xml b/java/res/values-ar/keycodes.xml
deleted file mode 100644
index 1f65a7c..0000000
--- a/java/res/values-ar/keycodes.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- U+0029: ")" RIGHT PARENTHESIS -->
- <integer name="keycode_for_left_parenthesis">0x0029</integer>
- <!-- U+0028: "(" LEFT PARENTHESIS -->
- <integer name="keycode_for_right_parenthesis">0x0028</integer>
- <!-- U+003E: ">" GREATER-THAN SIGN -->
- <integer name="keycode_for_less_than">0x003E</integer>
- <!-- U+003C: "<" LESS-THAN SIGN -->
- <integer name="keycode_for_greater_than">0x003C</integer>
- <!-- U+005D: "]" RIGHT SQUARE BRACKET -->
- <integer name="keycode_for_left_square_bracket">0x005D</integer>
- <!-- U+005B: "[" LEFT SQUARE BRACKET -->
- <integer name="keycode_for_right_square_bracket">0x005B</integer>
- <!-- U+007D: "}" RIGHT CURLY BRACKET -->
- <integer name="keycode_for_left_curly_bracket">0x007D</integer>
- <!-- U+007B: "{" LEFT CURLY BRACKET -->
- <integer name="keycode_for_right_curly_bracket">0x007B</integer>
-</resources>
diff --git a/java/res/values-fa/keycodes.xml b/java/res/values-fa/keycodes.xml
deleted file mode 100644
index 1f65a7c..0000000
--- a/java/res/values-fa/keycodes.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- U+0029: ")" RIGHT PARENTHESIS -->
- <integer name="keycode_for_left_parenthesis">0x0029</integer>
- <!-- U+0028: "(" LEFT PARENTHESIS -->
- <integer name="keycode_for_right_parenthesis">0x0028</integer>
- <!-- U+003E: ">" GREATER-THAN SIGN -->
- <integer name="keycode_for_less_than">0x003E</integer>
- <!-- U+003C: "<" LESS-THAN SIGN -->
- <integer name="keycode_for_greater_than">0x003C</integer>
- <!-- U+005D: "]" RIGHT SQUARE BRACKET -->
- <integer name="keycode_for_left_square_bracket">0x005D</integer>
- <!-- U+005B: "[" LEFT SQUARE BRACKET -->
- <integer name="keycode_for_right_square_bracket">0x005B</integer>
- <!-- U+007D: "}" RIGHT CURLY BRACKET -->
- <integer name="keycode_for_left_curly_bracket">0x007D</integer>
- <!-- U+007B: "{" LEFT CURLY BRACKET -->
- <integer name="keycode_for_right_curly_bracket">0x007B</integer>
-</resources>
diff --git a/java/res/values-iw/keycodes.xml b/java/res/values-iw/keycodes.xml
deleted file mode 100644
index 1f65a7c..0000000
--- a/java/res/values-iw/keycodes.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- U+0029: ")" RIGHT PARENTHESIS -->
- <integer name="keycode_for_left_parenthesis">0x0029</integer>
- <!-- U+0028: "(" LEFT PARENTHESIS -->
- <integer name="keycode_for_right_parenthesis">0x0028</integer>
- <!-- U+003E: ">" GREATER-THAN SIGN -->
- <integer name="keycode_for_less_than">0x003E</integer>
- <!-- U+003C: "<" LESS-THAN SIGN -->
- <integer name="keycode_for_greater_than">0x003C</integer>
- <!-- U+005D: "]" RIGHT SQUARE BRACKET -->
- <integer name="keycode_for_left_square_bracket">0x005D</integer>
- <!-- U+005B: "[" LEFT SQUARE BRACKET -->
- <integer name="keycode_for_right_square_bracket">0x005B</integer>
- <!-- U+007D: "}" RIGHT CURLY BRACKET -->
- <integer name="keycode_for_left_curly_bracket">0x007D</integer>
- <!-- U+007B: "{" LEFT CURLY BRACKET -->
- <integer name="keycode_for_right_curly_bracket">0x007B</integer>
-</resources>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 39d50e3..d574b9e 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -229,10 +229,14 @@
</declare-styleable>
<declare-styleable name="Keyboard_Key">
- <!-- The unicode value that this key outputs. -->
- <attr name="code" format="integer" />
- <!-- The alternate unicode value that this key outputs while typing. -->
- <attr name="altCode" format="integer" />
+ <!-- The unicode value that this key outputs.
+ Code value represented in hexadecimal prefixed with "0x" or code value reference using
+ "!code/<code_name>" notation. -->
+ <attr name="code" format="string" />
+ <!-- The alternate unicode value that this key outputs while typing.
+ Code value represented in hexadecimal prefixed with "0x" or code value reference using
+ "!code/<code_name>" notation. -->
+ <attr name="altCode" format="string" />
<!-- The keys to display in the more keys keyboard. -->
<attr name="moreKeys" format="string" />
<!-- The keys to display in the more keys keyboard in addition to moreKeys.
diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml
index f50dd4f..5e97edc 100644
--- a/java/res/values/donottranslate-more-keys.xml
+++ b/java/res/values/donottranslate-more-keys.xml
@@ -120,11 +120,11 @@
U+2205: "∅" EMPTY SET -->
<string name="more_keys_for_symbols_0">ⁿ,∅</string>
<string name="more_keys_for_am_pm">!fixedColumnOrder!2,!hasLabels!,\@string/label_time_am,\@string/label_time_pm</string>
- <string name="settings_as_more_key">\@icon/settingsKey|\@integer/key_settings</string>
+ <string name="settings_as_more_key">\@icon/settingsKey|!code/key_settings</string>
<string name="keylabel_for_comma">,</string>
<string name="more_keys_for_comma"></string>
- <string name="action_next_as_more_key">!hasLabels!,\@string/label_next_key|\@integer/key_action_next</string>
- <string name="action_previous_as_more_key">!hasLabels!,\@string/label_previous_key|\@integer/key_action_previous</string>
+ <string name="action_next_as_more_key">!hasLabels!,\@string/label_next_key|!code/key_action_next</string>
+ <string name="action_previous_as_more_key">!hasLabels!,\@string/label_previous_key|!code/key_action_previous</string>
<string name="keylabel_for_symbols_question">\?</string>
<string name="keylabel_for_symbols_semicolon">;</string>
<string name="keylabel_for_symbols_percent">%</string>
diff --git a/java/res/values/keycodes.xml b/java/res/values/keycodes.xml
deleted file mode 100644
index f42495a..0000000
--- a/java/res/values/keycodes.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources>
- <!-- These code should be aligned with Keyboard.CODE_*. -->
- <integer name="key_tab">9</integer>
- <integer name="key_enter">10</integer>
- <integer name="key_space">32</integer>
- <integer name="key_shift">-1</integer>
- <integer name="key_switch_alpha_symbol">-2</integer>
- <integer name="key_output_text">-3</integer>
- <integer name="key_delete">-4</integer>
- <integer name="key_settings">-5</integer>
- <integer name="key_shortcut">-6</integer>
- <integer name="key_action_enter">-7</integer>
- <integer name="key_action_next">-8</integer>
- <integer name="key_action_previous">-9</integer>
- <integer name="key_language_switch">-10</integer>
- <integer name="key_unspecified">-11</integer>
- <!-- U+0028: "(" LEFT PARENTHESIS -->
- <integer name="keycode_for_left_parenthesis">0x0028</integer>
- <!-- U+0029: ")" RIGHT PARENTHESIS -->
- <integer name="keycode_for_right_parenthesis">0x0029</integer>
- <!-- U+003C: "<" LESS-THAN SIGN -->
- <integer name="keycode_for_less_than">0x003C</integer>
- <!-- U+003E: ">" GREATER-THAN SIGN -->
- <integer name="keycode_for_greater_than">0x003E</integer>
- <!-- U+005B: "[" LEFT SQUARE BRACKET -->
- <integer name="keycode_for_left_square_bracket">0x005B</integer>
- <!-- U+005D: "]" RIGHT SQUARE BRACKET -->
- <integer name="keycode_for_right_square_bracket">0x005D</integer>
- <!-- U+007B: "{" LEFT CURLY BRACKET -->
- <integer name="keycode_for_left_curly_bracket">0x007B</integer>
- <!-- U+007D: "}" RIGHT CURLY BRACKET -->
- <integer name="keycode_for_right_curly_bracket">0x007D</integer>
-</resources>
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index 45e22fc..3cec9aa 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -42,7 +42,7 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyIcon="iconShiftKeyShifted"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="stickyOff" />
@@ -52,7 +52,7 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyIcon="iconShiftKeyShifted"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="stickyOn" />
@@ -60,7 +60,7 @@
<default>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyIcon="iconShiftKey"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="stickyOff" />
@@ -68,7 +68,7 @@
</switch>
<key-style
latin:styleName="deleteKeyStyle"
- latin:code="@integer/key_delete"
+ latin:code="!code/key_delete"
latin:keyIcon="iconDeleteKey"
latin:keyActionFlags="isRepeatable|noKeyPreview"
latin:backgroundType="functional" />
@@ -76,7 +76,7 @@
latin:keyboardLayout="@xml/key_styles_enter" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:code="@integer/key_space"
+ latin:code="!code/key_space"
latin:keyActionFlags="noKeyPreview" />
<!-- U+200C: ZERO WIDTH NON-JOINER
U+200D: ZERO WIDTH JOINER -->
@@ -95,7 +95,7 @@
latin:moreKeys="@string/more_keys_for_smiley" />
<key-style
latin:styleName="shortcutKeyStyle"
- latin:code="@integer/key_shortcut"
+ latin:code="!code/key_shortcut"
latin:keyIcon="iconShortcutKey"
latin:keyIconDisabled="iconDisabledShortcutKey"
latin:keyLabelFlags="preserveCase"
@@ -103,7 +103,7 @@
latin:backgroundType="functional" />
<key-style
latin:styleName="settingsKeyStyle"
- latin:code="@integer/key_settings"
+ latin:code="!code/key_settings"
latin:keyIcon="iconSettingsKey"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:backgroundType="functional" />
@@ -114,7 +114,7 @@
>
<key-style
latin:styleName="tabKeyStyle"
- latin:code="@integer/key_action_previous"
+ latin:code="!code/key_action_previous"
latin:keyIcon="iconTabKey"
latin:keyIconPreview="iconPreviewTabKey"
latin:backgroundType="functional" />
@@ -122,7 +122,7 @@
<default>
<key-style
latin:styleName="tabKeyStyle"
- latin:code="@integer/key_tab"
+ latin:code="!code/key_tab"
latin:keyIcon="iconTabKey"
latin:keyIconPreview="iconPreviewTabKey"
latin:backgroundType="functional" />
@@ -130,28 +130,28 @@
</switch>
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:code="@integer/key_switch_alpha_symbol"
+ latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toAlphaKeyStyle"
- latin:code="@integer/key_switch_alpha_symbol"
+ latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_alpha_key"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyLabel="@string/label_to_more_symbol_for_tablet_key"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyLabel="@string/label_to_symbol_key"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview"
diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml
index e1c2369..c3ad195 100644
--- a/java/res/xml-sw768dp/key_styles_common.xml
+++ b/java/res/xml-sw768dp/key_styles_common.xml
@@ -41,7 +41,7 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyIcon="iconShiftKeyShifted"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="stickyOff" />
@@ -51,7 +51,7 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyIcon="iconShiftKeyShifted"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="stickyOn" />
@@ -59,7 +59,7 @@
<default>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyIcon="iconShiftKey"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="stickyOff" />
@@ -67,7 +67,7 @@
</switch>
<key-style
latin:styleName="deleteKeyStyle"
- latin:code="@integer/key_delete"
+ latin:code="!code/key_delete"
latin:keyIcon="iconDeleteKey"
latin:keyActionFlags="isRepeatable|noKeyPreview"
latin:backgroundType="functional" />
@@ -75,7 +75,7 @@
latin:keyboardLayout="@xml/key_styles_enter" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:code="@integer/key_space"
+ latin:code="!code/key_space"
latin:keyActionFlags="noKeyPreview" />
<!-- U+200C: ZERO WIDTH NON-JOINER
U+200D: ZERO WIDTH JOINER -->
@@ -94,7 +94,7 @@
latin:moreKeys="@string/more_keys_for_smiley" />
<key-style
latin:styleName="shortcutKeyStyle"
- latin:code="@integer/key_shortcut"
+ latin:code="!code/key_shortcut"
latin:keyIcon="iconShortcutKey"
latin:keyIconDisabled="iconDisabledShortcutKey"
latin:keyLabelFlags="preserveCase"
@@ -102,7 +102,7 @@
latin:backgroundType="functional" />
<key-style
latin:styleName="settingsKeyStyle"
- latin:code="@integer/key_settings"
+ latin:code="!code/key_settings"
latin:keyIcon="iconSettingsKey"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:backgroundType="functional" />
@@ -113,7 +113,7 @@
>
<key-style
latin:styleName="tabKeyStyle"
- latin:code="@integer/key_action_previous"
+ latin:code="!code/key_action_previous"
latin:keyLabel="@string/label_tab_key"
latin:keyLabelFlags="fontNormal|preserveCase"
latin:backgroundType="functional" />
@@ -121,7 +121,7 @@
<default>
<key-style
latin:styleName="tabKeyStyle"
- latin:code="@integer/key_tab"
+ latin:code="!code/key_tab"
latin:keyLabel="@string/label_tab_key"
latin:keyLabelFlags="fontNormal|preserveCase"
latin:backgroundType="functional" />
@@ -129,28 +129,28 @@
</switch>
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:code="@integer/key_switch_alpha_symbol"
+ latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
latin:keyLabelFlags="fontNormal|preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toAlphaKeyStyle"
- latin:code="@integer/key_switch_alpha_symbol"
+ latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_alpha_key"
latin:keyLabelFlags="fontNormal|preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyLabel="@string/label_to_more_symbol_for_tablet_key"
latin:keyLabelFlags="fontNormal|preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyLabel="@string/label_to_symbol_key"
latin:keyLabelFlags="fontNormal|preserveCase"
latin:keyActionFlags="noKeyPreview"
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index 8d01091..bd002fd 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -46,7 +46,7 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyIcon="iconShiftKeyShifted"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="stickyOff" />
@@ -56,7 +56,7 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyIcon="iconShiftKeyShifted"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="stickyOn" />
@@ -64,7 +64,7 @@
<default>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyIcon="iconShiftKey"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="stickyOff" />
@@ -72,7 +72,7 @@
</switch>
<key-style
latin:styleName="deleteKeyStyle"
- latin:code="@integer/key_delete"
+ latin:code="!code/key_delete"
latin:keyIcon="iconDeleteKey"
latin:keyActionFlags="isRepeatable|noKeyPreview"
latin:backgroundType="functional" />
@@ -104,7 +104,7 @@
</switch>
<key-style
latin:styleName="spaceKeyStyle"
- latin:code="@integer/key_space"
+ latin:code="!code/key_space"
latin:keyActionFlags="noKeyPreview|enableLongPress"
latin:backgroundType="functional" />
<!-- U+200C: ZERO WIDTH NON-JOINER
@@ -119,23 +119,23 @@
latin:backgroundType="functional" />
<key-style
latin:styleName="shortcutKeyStyle"
- latin:code="@integer/key_shortcut"
+ latin:code="!code/key_shortcut"
latin:keyIcon="iconShortcutKey"
latin:keyIconDisabled="iconDisabledShortcutKey"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
- latin:altCode="@integer/key_space"
+ latin:altCode="!code/key_space"
latin:parentStyle="f1MoreKeysStyle" />
<key-style
latin:styleName="languageSwitchKeyStyle"
- latin:code="@integer/key_language_switch"
+ latin:code="!code/key_language_switch"
latin:keyIcon="iconLanguageSwitchKey"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress"
- latin:altCode="@integer/key_space"
+ latin:altCode="!code/key_space"
latin:backgroundType="functional" />
<key-style
latin:styleName="tabKeyStyle"
- latin:code="@integer/key_tab"
+ latin:code="!code/key_tab"
latin:keyIcon="iconTabKey"
latin:keyIconPreview="iconPreviewTabKey"
latin:backgroundType="functional" />
@@ -143,7 +143,7 @@
laid out as normal letter key. -->
<key-style
latin:styleName="nonSpecialBackgroundTabKeyStyle"
- latin:code="@integer/key_tab"
+ latin:code="!code/key_tab"
latin:keyIcon="iconTabKey"
latin:keyIconPreview="iconPreviewTabKey" />
<switch>
@@ -156,7 +156,7 @@
>
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:code="@integer/key_switch_alpha_symbol"
+ latin:code="!code/key_switch_alpha_symbol"
latin:keyIcon="iconShortcutForLabel"
latin:keyLabel="@string/label_to_symbol_with_microphone_key"
latin:keyLabelFlags="withIconRight|preserveCase"
@@ -166,7 +166,7 @@
<default>
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:code="@integer/key_switch_alpha_symbol"
+ latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview"
@@ -175,21 +175,21 @@
</switch>
<key-style
latin:styleName="toAlphaKeyStyle"
- latin:code="@integer/key_switch_alpha_symbol"
+ latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_alpha_key"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyLabel="@string/label_to_more_symbol_key"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
- latin:code="@integer/key_shift"
+ latin:code="!code/key_shift"
latin:keyLabel="@string/label_to_symbol_key"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview"
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index e15a0be..49759c4 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -92,7 +92,7 @@
<!-- Enter key style -->
<key-style
latin:styleName="defaultEnterKeyStyle"
- latin:code="@integer/key_enter"
+ latin:code="!code/key_enter"
latin:keyIcon="iconReturnKey"
latin:keyLabelFlags="autoXScale|preserveCase"
latin:keyActionFlags="noKeyPreview"
@@ -100,7 +100,7 @@
latin:parentStyle="navigateMoreKeysStyle" />
<key-style
latin:styleName="defaultActionKeyStyle"
- latin:code="@integer/key_action_enter"
+ latin:code="!code/key_action_enter"
latin:keyIcon="iconUndefined"
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml
index 1fc2169..e1c5e5b 100644
--- a/java/res/xml/key_styles_number.xml
+++ b/java/res/xml/key_styles_number.xml
@@ -99,12 +99,12 @@
<!-- Only for non-tablet device -->
<key-style
latin:styleName="numPhoneToSymbolKeyStyle"
- latin:code="@integer/key_switch_alpha_symbol"
+ latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_phone_symbols_key"
latin:parentStyle="numModeKeyStyle" />
<key-style
latin:styleName="numPhoneToNumericKeyStyle"
- latin:code="@integer/key_switch_alpha_symbol"
+ latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_phone_numeric_key"
latin:parentStyle="numModeKeyStyle" />
<!-- U+002C: "," COMMA -->
@@ -127,7 +127,7 @@
latin:parentStyle="tabKeyStyle" />
<key-style
latin:styleName="numSpaceKeyStyle"
- latin:code="@integer/key_space"
+ latin:code="!code/key_space"
latin:keyIcon="iconSpaceKeyForNumberLayout"
latin:keyActionFlags="enableLongPress"
latin:parentStyle="numKeyBaseStyle" />
diff --git a/java/res/xml/keys_curly_brackets.xml b/java/res/xml/keys_curly_brackets.xml
index d21a092..6a4b1a9 100644
--- a/java/res/xml/keys_curly_brackets.xml
+++ b/java/res/xml/keys_curly_brackets.xml
@@ -23,8 +23,8 @@
>
<Key
latin:keyLabel="{"
- latin:code="@integer/keycode_for_left_curly_bracket" />
+ latin:code="!code/key_left_curly_bracket" />
<Key
latin:keyLabel="}"
- latin:code="@integer/keycode_for_right_curly_bracket" />
+ latin:code="!code/key_right_curly_bracket" />
</merge>
diff --git a/java/res/xml/keys_less_greater.xml b/java/res/xml/keys_less_greater.xml
index 8961d9c..831f2dd 100644
--- a/java/res/xml/keys_less_greater.xml
+++ b/java/res/xml/keys_less_greater.xml
@@ -23,10 +23,10 @@
>
<Key
latin:keyLabel="<"
- latin:code="@integer/keycode_for_less_than"
+ latin:code="!code/key_less_than"
latin:moreKeys="@string/more_keys_for_less_than" />
<Key
latin:keyLabel=">"
- latin:code="@integer/keycode_for_greater_than"
+ latin:code="!code/key_greater_than"
latin:moreKeys="@string/more_keys_for_greater_than" />
</merge>
diff --git a/java/res/xml/keys_parentheses.xml b/java/res/xml/keys_parentheses.xml
index 6853bf1..502a84e 100644
--- a/java/res/xml/keys_parentheses.xml
+++ b/java/res/xml/keys_parentheses.xml
@@ -23,10 +23,10 @@
>
<Key
latin:keyLabel="("
- latin:code="@integer/keycode_for_left_parenthesis"
+ latin:code="!code/key_left_parenthesis"
latin:moreKeys="@string/more_keys_for_left_parenthesis" />
<Key
latin:keyLabel=")"
- latin:code="@integer/keycode_for_right_parenthesis"
+ latin:code="!code/key_right_parenthesis"
latin:moreKeys="@string/more_keys_for_right_parenthesis" />
</merge>
diff --git a/java/res/xml/keys_square_brackets.xml b/java/res/xml/keys_square_brackets.xml
index 44387c3..5c128fd 100644
--- a/java/res/xml/keys_square_brackets.xml
+++ b/java/res/xml/keys_square_brackets.xml
@@ -23,8 +23,8 @@
>
<Key
latin:keyLabel="["
- latin:code="@integer/keycode_for_left_square_bracket" />
+ latin:code="!code/key_left_square_bracket" />
<Key
latin:keyLabel="]"
- latin:code="@integer/keycode_for_right_square_bracket" />
+ latin:code="!code/key_right_square_bracket" />
</merge>