diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-10-24 14:31:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-24 14:31:41 -0700 |
| commit | 2ef36763700eff5679d6012e7f078c57f1a4c465 (patch) | |
| tree | 3b36010de56350d0b88914c4fbd729afa38acd00 /native | |
| parent | b34fe2f0258eb1ed512b682206b7fe65116f1dbd (diff) | |
| parent | 860c2df4132a2a0be9bcb0e91bfb7e79588c000f (diff) | |
| download | frameworks_base-2ef36763700eff5679d6012e7f078c57f1a4c465.zip frameworks_base-2ef36763700eff5679d6012e7f078c57f1a4c465.tar.gz frameworks_base-2ef36763700eff5679d6012e7f078c57f1a4c465.tar.bz2 | |
am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread
Merge commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f' into gingerbread-plus-aosp
* commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f':
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 5580700..7df13c3 100644 --- a/native/include/android/input.h +++ b/native/include/android/input.h @@ -306,6 +306,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, }; /* |