diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-07-13 17:48:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-13 17:48:56 -0700 |
| commit | 6ac7674e143f9716312f048da3f25ca83b646315 (patch) | |
| tree | 53fe0d254223187c268773539fc37bc5f2a415ce /core | |
| parent | e5e285509fdba2b996006e610e0d2888450230f0 (diff) | |
| parent | 89ee578b7053d27a50922f82feb94bf6054b330c (diff) | |
| download | frameworks_base-6ac7674e143f9716312f048da3f25ca83b646315.zip frameworks_base-6ac7674e143f9716312f048da3f25ca83b646315.tar.gz frameworks_base-6ac7674e143f9716312f048da3f25ca83b646315.tar.bz2 | |
am 89ee578b: am fd035829: Add initial gamepad support.
Merge commit '89ee578b7053d27a50922f82feb94bf6054b330c'
* commit '89ee578b7053d27a50922f82feb94bf6054b330c':
Add initial gamepad support.
Diffstat (limited to 'core')
| -rwxr-xr-x | core/java/android/view/KeyEvent.java | 16 | ||||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 15 |
2 files changed, 31 insertions, 0 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 0bfb6d6..9c05008 100755 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -124,11 +124,27 @@ public class KeyEvent implements Parcelable { public static final int KEYCODE_PAGE_DOWN = 93; public static final int KEYCODE_PICTSYMBOLS = 94; // switch symbol-sets (Emoji,Kao-moji) public static final int KEYCODE_SWITCH_CHARSET = 95; // switch char-sets (Kanji,Katakana) + public static final int KEYCODE_BUTTON_A = 96; + public static final int KEYCODE_BUTTON_B = 97; + public static final int KEYCODE_BUTTON_C = 98; + public static final int KEYCODE_BUTTON_X = 99; + public static final int KEYCODE_BUTTON_Y = 100; + public static final int KEYCODE_BUTTON_Z = 101; + public static final int KEYCODE_BUTTON_L1 = 102; + public static final int KEYCODE_BUTTON_R1 = 103; + public static final int KEYCODE_BUTTON_L2 = 104; + public static final int KEYCODE_BUTTON_R2 = 105; + public static final int KEYCODE_BUTTON_THUMBL = 106; + public static final int KEYCODE_BUTTON_THUMBR = 107; + public static final int KEYCODE_BUTTON_START = 108; + public static final int KEYCODE_BUTTON_SELECT = 109; + public static final int KEYCODE_BUTTON_MODE = 110; // NOTE: If you add a new keycode here you must also add it to: // isSystem() // native/include/android/keycodes.h // frameworks/base/include/ui/KeycodeLabels.h + // external/webkit/WebKit/android/plugins/ANPKeyCodes.h // tools/puppet_master/PuppetMaster/nav_keys.py // frameworks/base/core/res/res/values/attrs.xml // commands/monkey/Monkey.java diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index b3f280b..67072b6 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -942,6 +942,21 @@ <enum name="KEYCODE_PAGE_DOWN" value="93" /> <enum name="KEYCODE_PICTSYMBOLS" value="94" /> <enum name="KEYCODE_SWITCH_CHARSET" value="95" /> + <enum name="KEYCODE_BUTTON_A" value="96" /> + <enum name="KEYCODE_BUTTON_B" value="97" /> + <enum name="KEYCODE_BUTTON_C" value="98" /> + <enum name="KEYCODE_BUTTON_X" value="99" /> + <enum name="KEYCODE_BUTTON_Y" value="100" /> + <enum name="KEYCODE_BUTTON_Z" value="101" /> + <enum name="KEYCODE_BUTTON_L1" value="102" /> + <enum name="KEYCODE_BUTTON_R1" value="103" /> + <enum name="KEYCODE_BUTTON_L2" value="104" /> + <enum name="KEYCODE_BUTTON_R2" value="105" /> + <enum name="KEYCODE_BUTTON_THUMBL" value="106" /> + <enum name="KEYCODE_BUTTON_THUMBR" value="107" /> + <enum name="KEYCODE_BUTTON_START" value="108" /> + <enum name="KEYCODE_BUTTON_SELECT" value="109" /> + <enum name="KEYCODE_BUTTON_MODE" value="110" /> </attr> <!-- ***************************************************************** --> |