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

Commit 2aaa6bbd authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Renaming the constants for activation and long press." into jb-dev

parents ad0b0060 87bd0dcc

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2017,6 +2017,7 @@ package android.accessibilityservice { 
    method protected void onServiceConnected();

    method public final boolean performGlobalAction(int);

    method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo);

    field public static final int GESTURE_DOUBLE_TAP = 17; // 0x11

    field public static final int GESTURE_SWIPE_DOWN = 2; // 0x2

    field public static final int GESTURE_SWIPE_DOWN_AND_LEFT = 15; // 0xf

    field public static final int GESTURE_SWIPE_DOWN_AND_RIGHT = 16; // 0x10
@@ -2033,8 +2034,7 @@ package android.accessibilityservice { 
    field public static final int GESTURE_SWIPE_UP_AND_DOWN = 7; // 0x7

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

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

    field public static final int GESTURE_TWO_FINGER_LONG_PRESS = 18; // 0x12

    field public static final int GESTURE_TWO_FINGER_TAP = 17; // 0x11

    field public static final int GESTURE_TAP_AND_HOLD = 18; // 0x12

    field public static final int GLOBAL_ACTION_BACK = 1; // 0x1

    field public static final int GLOBAL_ACTION_HOME = 2; // 0x2

    field public static final int GLOBAL_ACTION_NOTIFICATIONS = 4; // 0x4

core/java/android/accessibilityservice/AccessibilityService.java

+6 −6
Original line number Diff line number Diff line
@@ -284,14 +284,14 @@ public abstract class AccessibilityService extends Service { 
    public static final int GESTURE_SWIPE_DOWN_AND_RIGHT = 16;



    /**

     * The user has performed a two finger tap gesture on the touch screen.

     * The user has performed a double tap gesture on the touch screen.

     */

    public static final int GESTURE_TWO_FINGER_TAP = 17;

    public static final int GESTURE_DOUBLE_TAP = 17;



    /**

     * The user has performed a two finger long press gesture on the touch screen.

     * The user has performed a tap and hold gesture on the touch screen.

     */

    public static final int GESTURE_TWO_FINGER_LONG_PRESS = 18;

    public static final int GESTURE_TAP_AND_HOLD = 18;



    /**

     * The {@link Intent} that must be declared as handled by the service.
@@ -408,8 +408,8 @@ public abstract class AccessibilityService extends Service { 
     * @see #GESTURE_SWIPE_RIGHT_AND_DOWN

     * @see #GESTURE_CLOCKWISE_CIRCLE

     * @see #GESTURE_COUNTER_CLOCKWISE_CIRCLE

     * @see #GESTURE_TWO_FINGER_TAP

     * @see #GESTURE_TWO_FINGER_LONG_PRESS

     * @see #GESTURE_DOUBLE_TAP

     * @see #GESTURE_TAP_AND_HOLD

     */

    protected boolean onGesture(int gestureId) {

        // TODO: Describe the default gesture processing in the javaDoc once it is finalized.