diff options
| author | Michael Wright <michaelwr@google.com> | 2015-05-14 15:31:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 15:31:21 +0000 |
| commit | 7c000280a57f352c2485dcaea1d5bfe20f7bfe63 (patch) | |
| tree | f6cfed2123c475f365c44d05b053499cafcb4568 /include/android | |
| parent | c921ce268155e8e1d75bd423514bb5a3ee363440 (diff) | |
| parent | b03f103fd40d9028731a81e87a817a3e3bd07fa4 (diff) | |
| download | frameworks_native-7c000280a57f352c2485dcaea1d5bfe20f7bfe63.zip frameworks_native-7c000280a57f352c2485dcaea1d5bfe20f7bfe63.tar.gz frameworks_native-7c000280a57f352c2485dcaea1d5bfe20f7bfe63.tar.bz2 | |
Merge changes from topic 'button_actions' into mnc-dev
* changes:
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 a660761..c7635b8 100644 --- a/include/android/input.h +++ b/include/android/input.h @@ -305,6 +305,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, }; /* @@ -405,6 +411,8 @@ enum { AMOTION_EVENT_BUTTON_TERTIARY = 1 << 2, AMOTION_EVENT_BUTTON_BACK = 1 << 3, AMOTION_EVENT_BUTTON_FORWARD = 1 << 4, + AMOTION_EVENT_BUTTON_STYLUS_PRIMARY = 1 << 5, + AMOTION_EVENT_BUTTON_STYLUS_SECONDARY = 1 << 6, }; /* |