diff --git a/api/current.txt b/api/current.txt index 4bd0fc0574c14..49c12725f43c2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -40249,6 +40249,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 diff --git a/api/system-current.txt b/api/system-current.txt index 18dd49fe1aaf2..0fe65c33e4f73 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -42587,6 +42587,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 diff --git a/api/test-current.txt b/api/test-current.txt index 205b06df2027f..e343cfbc404e4 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -40251,6 +40251,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 diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index 527d7e51c3e32..0195decfcf16e 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -973,7 +973,6 @@ public final class MotionEvent extends InputEvent implements Parcelable { *

* * @see #getAxisValue(int, int) - * {@hide} */ public static final int AXIS_SCROLL = 26;