summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--api/test-current.txt1
-rw-r--r--core/java/android/view/MotionEvent.java1
4 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index a03ef38035fb..28511c404d94 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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
diff --git a/api/system-current.txt b/api/system-current.txt
index 406d51c4f428..085a6d7d5e01 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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
diff --git a/api/test-current.txt b/api/test-current.txt
index 1be19ed32858..3014394cabb3 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -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
diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java
index 2129039b1b8c..5f55bdc0e0d3 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 {
* </p>
*
* @see #getAxisValue(int, int)
- * {@hide}
*/
public static final int AXIS_SCROLL = 26;