diff options
| author | Michael Wright <michaelwr@google.com> | 2015-05-14 19:29:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-14 19:29:01 +0000 |
| commit | baaeb2b83f9cff99660123578481a87abb26b54d (patch) | |
| tree | 9c61145da1c4cd0d45c436b8bb19ebf3e4817097 /include/android | |
| parent | c01f5d2e1989a502d58359f2f0c9812831160107 (diff) | |
| parent | 7c000280a57f352c2485dcaea1d5bfe20f7bfe63 (diff) | |
| download | frameworks_native-baaeb2b83f9cff99660123578481a87abb26b54d.zip frameworks_native-baaeb2b83f9cff99660123578481a87abb26b54d.tar.gz frameworks_native-baaeb2b83f9cff99660123578481a87abb26b54d.tar.bz2 | |
am 7c000280: Merge changes from topic \'button_actions\' into mnc-dev
* commit '7c000280a57f352c2485dcaea1d5bfe20f7bfe63':
Fix input tests to work with new MotionEvent member
Revert "Revert "Add new MotionEvent actions for button press and release.""
Diffstat (limited to 'include/android')
| -rw-r--r-- | include/android/input.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/android/input.h b/include/android/input.h index b11af84..7b76539 100644 --- a/include/android/input.h +++ b/include/android/input.h @@ -336,6 +336,12 @@ enum { /** The pointer is not down but has exited the boundaries of a window or view. */ AMOTION_EVENT_ACTION_HOVER_EXIT = 10, + + /* One or more buttons have been pressed. */ + AMOTION_EVENT_ACTION_BUTTON_PRESS = 11, + + /* One or more buttons have been released. */ + AMOTION_EVENT_ACTION_BUTTON_RELEASE = 12, }; /** @@ -737,6 +743,8 @@ enum { AMOTION_EVENT_BUTTON_BACK = 1 << 3, /** forward */ AMOTION_EVENT_BUTTON_FORWARD = 1 << 4, + AMOTION_EVENT_BUTTON_STYLUS_PRIMARY = 1 << 5, + AMOTION_EVENT_BUTTON_STYLUS_SECONDARY = 1 << 6, }; /** |