diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-16 13:05:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 13:05:50 -0700 |
| commit | 707929d6f8f8ff2663da9982a99f943736b8be5c (patch) | |
| tree | c68c3251dc53422c136ab6ec239033b60ec32e33 /native | |
| parent | 6cca469ed6e58444dc6264a353510250cacfcf09 (diff) | |
| parent | 61cf67a220ba3205737c646c1c836a92074220de (diff) | |
| download | frameworks_base-707929d6f8f8ff2663da9982a99f943736b8be5c.zip frameworks_base-707929d6f8f8ff2663da9982a99f943736b8be5c.tar.gz frameworks_base-707929d6f8f8ff2663da9982a99f943736b8be5c.tar.bz2 | |
am 61cf67a2: am 24326f72: Merge "Input API review." into gingerbread
Merge commit '61cf67a220ba3205737c646c1c836a92074220de'
* commit '61cf67a220ba3205737c646c1c836a92074220de':
Input API review.
Diffstat (limited to 'native')
| -rw-r--r-- | native/include/android/input.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/native/include/android/input.h b/native/include/android/input.h index c1134bf..5580700 100644 --- a/native/include/android/input.h +++ b/native/include/android/input.h @@ -295,7 +295,6 @@ enum { AINPUT_SOURCE_CLASS_POINTER = 0x00000002, AINPUT_SOURCE_CLASS_NAVIGATION = 0x00000004, AINPUT_SOURCE_CLASS_POSITION = 0x00000008, - AINPUT_SOURCE_CLASS_JOYSTICK = 0x00000010, }; enum { @@ -303,13 +302,10 @@ enum { AINPUT_SOURCE_KEYBOARD = 0x00000100 | AINPUT_SOURCE_CLASS_BUTTON, AINPUT_SOURCE_DPAD = 0x00000200 | AINPUT_SOURCE_CLASS_BUTTON, - AINPUT_SOURCE_GAMEPAD = 0x00000400 | AINPUT_SOURCE_CLASS_BUTTON, AINPUT_SOURCE_TOUCHSCREEN = 0x00001000 | AINPUT_SOURCE_CLASS_POINTER, AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER, AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION, AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION, - AINPUT_SOURCE_JOYSTICK_LEFT = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK, - AINPUT_SOURCE_JOYSTICK_RIGHT = 0x02000000 | AINPUT_SOURCE_CLASS_JOYSTICK, }; /* |