Merge "Revert "Re-hide AXIS_SCROLL constant.""

This commit is contained in:
Aaron Whyte
2017-02-16 03:41:21 +00:00
committed by Android (Google) Code Review
4 changed files with 3 additions and 1 deletions

View File

@@ -44111,6 +44111,7 @@ package android.view {
field public static final int AXIS_RX = 12; // 0xc
field public static final int AXIS_RY = 13; // 0xd
field public static final int AXIS_RZ = 14; // 0xe
field public static final int AXIS_SCROLL = 26; // 0x1a
field public static final int AXIS_SIZE = 3; // 0x3
field public static final int AXIS_THROTTLE = 19; // 0x13
field public static final int AXIS_TILT = 25; // 0x19

View File

@@ -47549,6 +47549,7 @@ package android.view {
field public static final int AXIS_RX = 12; // 0xc
field public static final int AXIS_RY = 13; // 0xd
field public static final int AXIS_RZ = 14; // 0xe
field public static final int AXIS_SCROLL = 26; // 0x1a
field public static final int AXIS_SIZE = 3; // 0x3
field public static final int AXIS_THROTTLE = 19; // 0x13
field public static final int AXIS_TILT = 25; // 0x19

View File

@@ -44418,6 +44418,7 @@ package android.view {
field public static final int AXIS_RX = 12; // 0xc
field public static final int AXIS_RY = 13; // 0xd
field public static final int AXIS_RZ = 14; // 0xe
field public static final int AXIS_SCROLL = 26; // 0x1a
field public static final int AXIS_SIZE = 3; // 0x3
field public static final int AXIS_THROTTLE = 19; // 0x13
field public static final int AXIS_TILT = 25; // 0x19

View File

@@ -1008,7 +1008,6 @@ public final class MotionEvent extends InputEvent implements Parcelable {
* </p>
*
* @see #getAxisValue(int, int)
* {@hide}
*/
public static final int AXIS_SCROLL = 26;