From 89625d35477606081e3ea46e287fe86f79b71f9c Mon Sep 17 00:00:00 2001 From: Aaron Whyte Date: Wed, 15 Feb 2017 15:54:22 -0800 Subject: Unhide InputDevice.SOURCE_ROTARY_ENCODER Test: Treehugger Bug: 27314061 Bug: 22836852 Bug: 18707397 Change-Id: Icfb5b09533b7fa785b16251accfd24a10daee034 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/view/InputDevice.java | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index a4c933fef7f6..c2348bb896c1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -43310,6 +43310,7 @@ package android.view { field public static final int SOURCE_KEYBOARD = 257; // 0x101 field public static final int SOURCE_MOUSE = 8194; // 0x2002 field public static final int SOURCE_MOUSE_RELATIVE = 131076; // 0x20004 + field public static final int SOURCE_ROTARY_ENCODER = 4194304; // 0x400000 field public static final int SOURCE_STYLUS = 16386; // 0x4002 field public static final int SOURCE_TOUCHPAD = 1048584; // 0x100008 field public static final int SOURCE_TOUCHSCREEN = 4098; // 0x1002 diff --git a/api/system-current.txt b/api/system-current.txt index a806153962c9..e23d3062428d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -46748,6 +46748,7 @@ package android.view { field public static final int SOURCE_KEYBOARD = 257; // 0x101 field public static final int SOURCE_MOUSE = 8194; // 0x2002 field public static final int SOURCE_MOUSE_RELATIVE = 131076; // 0x20004 + field public static final int SOURCE_ROTARY_ENCODER = 4194304; // 0x400000 field public static final int SOURCE_STYLUS = 16386; // 0x4002 field public static final int SOURCE_TOUCHPAD = 1048584; // 0x100008 field public static final int SOURCE_TOUCHSCREEN = 4098; // 0x1002 diff --git a/api/test-current.txt b/api/test-current.txt index b47331b42c00..7b41537c75a0 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -43615,6 +43615,7 @@ package android.view { field public static final int SOURCE_KEYBOARD = 257; // 0x101 field public static final int SOURCE_MOUSE = 8194; // 0x2002 field public static final int SOURCE_MOUSE_RELATIVE = 131076; // 0x20004 + field public static final int SOURCE_ROTARY_ENCODER = 4194304; // 0x400000 field public static final int SOURCE_STYLUS = 16386; // 0x4002 field public static final int SOURCE_TOUCHPAD = 1048584; // 0x100008 field public static final int SOURCE_TOUCHSCREEN = 4098; // 0x1002 diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java index 035d48ffc33f..ea2434e9e39d 100644 --- a/core/java/android/view/InputDevice.java +++ b/core/java/android/view/InputDevice.java @@ -268,7 +268,6 @@ public final class InputDevice implements Parcelable { * those of a scroll wheel. * * @see #SOURCE_CLASS_NONE - * {@hide} */ public static final int SOURCE_ROTARY_ENCODER = 0x00400000 | SOURCE_CLASS_NONE; -- cgit v1.2.3-59-g8ed1b