diff --git a/api/current.txt b/api/current.txt index 5ecef52dee272..6096bed42fecd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44107,6 +44107,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 e89c25cb48d14..38c921db1e771 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -47545,6 +47545,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 b38e2b2069f5f..b65a07412f7f8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -44414,6 +44414,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 2129039b1b8cc..5f55bdc0e0d33 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -1008,7 +1008,6 @@ public final class MotionEvent extends InputEvent implements Parcelable { *

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