summaryrefslogtreecommitdiff
path: root/include/android/input.h
diff options
context:
space:
mode:
author Prashant Malani <pmalani@google.com> 2016-01-13 12:52:25 -0800
committer Prashant Malani <pmalani@google.com> 2016-01-13 12:52:25 -0800
commit858b3b388904c196bc2932530c957ca373aaee17 (patch)
treeebf8a6f5d32ccbcf5f9550a3ee38922005be5259 /include/android/input.h
parent99008f317d1c4b3462170594fb25ed443544e54d (diff)
parent14af23d14098dd7f91364468afe205ef15433170 (diff)
resolve merge conflicts of 14af23d140 to master.
Change-Id: I1eee295f592bad672ad093dfbd9c0c2b555df0ed
Diffstat (limited to 'include/android/input.h')
-rw-r--r--include/android/input.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/android/input.h b/include/android/input.h
index fd9fa98e70..95d25d3dda 100644
--- a/include/android/input.h
+++ b/include/android/input.h
@@ -644,13 +644,6 @@ 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: The movement of x position of a motion event.
*
* - For a mouse, reports a difference of x position between the previous position.
@@ -839,8 +832,6 @@ 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,