Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15

Browse Source 
am: 6344cb8144

* commit '6344cb8144647e4e49bc69cbf34a084ca7712115':
  Add rotary encoder input source
This commit is contained in:
Prashant Malani
2015-12-08 01:37:05 +00:00
committed by android-build-merger
parent e4db3f0757 6344cb8144
commit 3ebd5ceb90
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/InputDevice.java
View File

@@ -255,6 +255,15 @@ public final class InputDevice implements Parcelable {
*/
public static final int SOURCE_TOUCH_NAVIGATION = 0x00200000 | SOURCE_CLASS_NONE;
/**
* The input source is a rotating encoder device whose motions should be interpreted as akin to
* those of a scroll wheel.
*
* @see #SOURCE_CLASS_NONE
* {@hide}
*/
public static final int SOURCE_ROTARY_ENCODER = 0x00400000 | SOURCE_CLASS_NONE;
/**
* The input source is a joystick.
* (It may also be a {@link #SOURCE_GAMEPAD}).

17
core/java/android/view/MotionEvent.java
View File

@@ -961,6 +961,22 @@ public final class MotionEvent extends InputEvent implements Parcelable {
*/
public static final int AXIS_TILT = 25;
/**
* Axis constant: Generic scroll axis of a motion event.
* <p>
* <ul>
* <li>Reports the relative movement of the generic scrolling device.
* </ul>
* </p><p>
* This axis should be used for scroll events that are neither strictly vertical nor horizontal.
* A good example would be the rotation of a rotary encoder input device.
* </p>
*
* @see #getAxisValue(int, int)
* {@hide}
*/
public static final int AXIS_SCROLL = 26;
/**
* Axis constant: Generic 1 axis of a motion event.
* The interpretation of a generic axis is device-specific.
@@ -1171,6 +1187,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
names.append(AXIS_BRAKE, "AXIS_BRAKE");
names.append(AXIS_DISTANCE, "AXIS_DISTANCE");
names.append(AXIS_TILT, "AXIS_TILT");
names.append(AXIS_SCROLL, "AXIS_SCROLL");
names.append(AXIS_GENERIC_1, "AXIS_GENERIC_1");
names.append(AXIS_GENERIC_2, "AXIS_GENERIC_2");
names.append(AXIS_GENERIC_3, "AXIS_GENERIC_3");