diff options
| author | Prashant Malani <pmalani@google.com> | 2015-12-08 01:27:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-12-08 01:27:17 +0000 |
| commit | 68fca5a1763203164a19a9aa983895242a671387 (patch) | |
| tree | 97aa3c86b0b2b7fa31f3215a6295a5d411bc92a7 /include | |
| parent | 8c3e55f4149deda3ec7c7a67fda81216d5f9af25 (diff) | |
| parent | ac72bbf4e46d6689070df09a25db2960a9036eb2 (diff) | |
| download | frameworks_native-68fca5a1763203164a19a9aa983895242a671387.zip frameworks_native-68fca5a1763203164a19a9aa983895242a671387.tar.gz frameworks_native-68fca5a1763203164a19a9aa983895242a671387.tar.bz2 | |
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/android/input.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/android/input.h b/include/android/input.h index 5ab4e29..5eeb7fc 100644 --- a/include/android/input.h +++ b/include/android/input.h @@ -644,6 +644,13 @@ enum { */ AMOTION_EVENT_AXIS_TILT = 25, /** + * Axis constant: Generic scroll axis of a motion event. + * + * - This is used for scroll axis motion events that can't be classified as strictly + * vertical or horizontal. The movement of a rotating scroller is an example of this. + */ + AMOTION_EVENT_AXIS_SCROLL = 26, + /** * Axis constant: Generic 1 axis of a motion event. * The interpretation of a generic axis is device-specific. */ @@ -817,6 +824,8 @@ enum { AINPUT_SOURCE_TOUCH_NAVIGATION = 0x00200000 | AINPUT_SOURCE_CLASS_NONE, /** joystick */ AINPUT_SOURCE_JOYSTICK = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK, + /** rotary encoder */ + AINPUT_SOURCE_ROTARY_ENCODER = 0x00400000 | AINPUT_SOURCE_CLASS_NONE, /** any */ AINPUT_SOURCE_ANY = 0xffffff00, |