Re-hide AXIS_SCROLL constant.

Bug: 22836852
Bug: 18707397
Change-Id: I9cf7111cf5e3b73efca2ec8c98bf07941d1cec4e

diff --git a/api/current.txt b/api/current.txt
index 78de860..7d3d337 100644 (file)
--- a/api/current.txt
+++ b/api/current.txt
@@ -40561,7 +40561,6 @@ 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 24d257d..9077be7 100644 (file)
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -42908,7 +42908,6 @@ 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 6b6bafb..8e16fbb 100644 (file)
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -40564,7 +40564,6 @@ 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 7a544b8..a0f5142 100644 (file)
--- a/core/java/android/view/MotionEvent.java
+++ b/core/java/android/view/MotionEvent.java
@@ -973,6 +973,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
      * </p>
      *
      * @see #getAxisValue(int, int)
+     * {@hide}
      */
     public static final int AXIS_SCROLL = 26;