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">&#x207F;,&#x2205;</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>