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

Commit 4eaa9423 authored by Prashant Malani's avatar Prashant Malani Committed by Android (Google) Code Review
Browse files

Merge "Remove hide annotation from AXIS_SCROLL"

parents 2fcbe218 04b4819f

api/current.txt

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

api/system-current.txt

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

api/test-current.txt

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

core/java/android/view/MotionEvent.java

+0 −1
Original line number Diff line number Diff line
@@ -973,7 +973,6 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     * </p>

     *

     * @see #getAxisValue(int, int)

     * {@hide}

     */

    public static final int AXIS_SCROLL = 26;