diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-10-24 14:36:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-24 14:36:23 -0700 |
| commit | 3ae4ac8538765d6cf5b8aceea8c81b21854321bd (patch) | |
| tree | d0e8ae9e1117ce1aeebf375a2807de5ed95c0655 /native | |
| parent | 4761b176ed241a88394968b983f06c5ae1aad26a (diff) | |
| parent | 2ef36763700eff5679d6012e7f078c57f1a4c465 (diff) | |
| download | frameworks_base-3ae4ac8538765d6cf5b8aceea8c81b21854321bd.zip frameworks_base-3ae4ac8538765d6cf5b8aceea8c81b21854321bd.tar.gz frameworks_base-3ae4ac8538765d6cf5b8aceea8c81b21854321bd.tar.bz2 | |
am 2ef36763: am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread
Merge commit '2ef36763700eff5679d6012e7f078c57f1a4c465'
* commit '2ef36763700eff5679d6012e7f078c57f1a4c465':
Add unit tests for native input and fix bugs identified.
Diffstat (limited to 'native')
| -rw-r--r-- | native/include/android/input.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/native/include/android/input.h b/native/include/android/input.h index d190e49..729dd2e 100644 --- a/native/include/android/input.h +++ b/native/include/android/input.h @@ -336,6 +336,8 @@ enum { 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_ANY = 0xffffff00, }; /* |