From 22db07f3085ab0879bf9cff0e75a26044e1655e2 Mon Sep 17 00:00:00 2001 From: Aaron Whyte Date: Wed, 15 Feb 2017 21:37:00 +0000 Subject: [PATCH] Revert "Re-hide AXIS_SCROLL constant." This reverts commit 8171658b9fdcbd8faf84aa01f187cc8e7d56fa9e. Bug: 27314061 Bug: 22836852 Bug: 18707397 Change-Id: I6f78962cfa18f11ce5c8caa1d146252bd79f6dbd --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/view/MotionEvent.java | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) 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;