diff options
| author | Michael Wright <michaelwr@google.com> | 2013-03-12 01:15:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-12 01:15:48 +0000 |
| commit | 2aee1b01b7f4e1e0849f5653139a995ad6ba877e (patch) | |
| tree | 78850231448d413cdf714a0c95e5b482658e2611 /include | |
| parent | d2d5a64aa21cfc548c8c8333d1b36979e5e5a640 (diff) | |
| parent | aadaca7169b847d855cf43d94f74800e9faadfc8 (diff) | |
| download | frameworks_native-2aee1b01b7f4e1e0849f5653139a995ad6ba877e.zip frameworks_native-2aee1b01b7f4e1e0849f5653139a995ad6ba877e.tar.gz frameworks_native-2aee1b01b7f4e1e0849f5653139a995ad6ba877e.tar.bz2 | |
Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/android/input.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/android/input.h b/include/android/input.h index f2befa9..c8ac938 100644 --- a/include/android/input.h +++ b/include/android/input.h @@ -428,6 +428,7 @@ enum { enum { AINPUT_SOURCE_CLASS_MASK = 0x000000ff, + AINPUT_SOURCE_CLASS_NONE = 0x00000000, AINPUT_SOURCE_CLASS_BUTTON = 0x00000001, AINPUT_SOURCE_CLASS_POINTER = 0x00000002, AINPUT_SOURCE_CLASS_NAVIGATION = 0x00000004, @@ -446,6 +447,7 @@ enum { AINPUT_SOURCE_STYLUS = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER, AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION, AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION, + AINPUT_SOURCE_TOUCH_NAVIGATION = 0x00200000 | AINPUT_SOURCE_CLASS_NONE, AINPUT_SOURCE_JOYSTICK = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK, AINPUT_SOURCE_ANY = 0xffffff00, |