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

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

Merge "Revert "Re-hide AXIS_SCROLL constant.""

parents 066eaa08 22db07f3

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -44111,6 +44111,7 @@ package android.view { 
    field public static final int AXIS_RX = 12; // 0xc

    field public static final int AXIS_RX = 12; // 0xc

    field public static final int AXIS_RY = 13; // 0xd

    field public static final int AXIS_RY = 13; // 0xd

    field public static final int AXIS_RZ = 14; // 0xe

    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_SIZE = 3; // 0x3

    field public static final int AXIS_THROTTLE = 19; // 0x13

    field public static final int AXIS_THROTTLE = 19; // 0x13

    field public static final int AXIS_TILT = 25; // 0x19

    field public static final int AXIS_TILT = 25; // 0x19

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -47549,6 +47549,7 @@ package android.view { 
    field public static final int AXIS_RX = 12; // 0xc

    field public static final int AXIS_RX = 12; // 0xc

    field public static final int AXIS_RY = 13; // 0xd

    field public static final int AXIS_RY = 13; // 0xd

    field public static final int AXIS_RZ = 14; // 0xe

    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_SIZE = 3; // 0x3

    field public static final int AXIS_THROTTLE = 19; // 0x13

    field public static final int AXIS_THROTTLE = 19; // 0x13

    field public static final int AXIS_TILT = 25; // 0x19

    field public static final int AXIS_TILT = 25; // 0x19

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -44418,6 +44418,7 @@ package android.view { 
    field public static final int AXIS_RX = 12; // 0xc

    field public static final int AXIS_RX = 12; // 0xc

    field public static final int AXIS_RY = 13; // 0xd

    field public static final int AXIS_RY = 13; // 0xd

    field public static final int AXIS_RZ = 14; // 0xe

    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_SIZE = 3; // 0x3

    field public static final int AXIS_THROTTLE = 19; // 0x13

    field public static final int AXIS_THROTTLE = 19; // 0x13

    field public static final int AXIS_TILT = 25; // 0x19

    field public static final int AXIS_TILT = 25; // 0x19

core/java/android/view/MotionEvent.java

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

     * </p>

     *

     *

     * @see #getAxisValue(int, int)

     * @see #getAxisValue(int, int)

     * {@hide}

     */

     */

    public static final int AXIS_SCROLL = 26;

    public static final int AXIS_SCROLL = 26;