Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdb8fcb6 authored by Aaron Whyte's avatar Aaron Whyte Committed by Android (Google) Code Review
Browse files

Merge "Unhide InputDevice.SOURCE_ROTARY_ENCODER"

parents f3a5cefd 89625d35

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43330,6 +43330,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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -46770,6 +46770,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

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43637,6 +43637,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

core/java/android/view/InputDevice.java

+0 −1
Original line number Diff line number Diff line
@@ -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;