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

Commit 75a720cf authored by Ameer Armaly's avatar Ameer Armaly Committed by Android (Google) Code Review
Browse files

Merge "Add gesture ids 43-45."

parents 13d990e6 ba854db8

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -2889,6 +2889,7 @@ package android.accessibilityservice { 
    field public static final int GESTURE_2_FINGER_DOUBLE_TAP = 20; // 0x14

    field public static final int GESTURE_2_FINGER_DOUBLE_TAP_AND_HOLD = 40; // 0x28

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

    field public static final int GESTURE_2_FINGER_SINGLE_TAP_AND_HOLD = 43; // 0x2b

    field public static final int GESTURE_2_FINGER_SWIPE_DOWN = 26; // 0x1a

    field public static final int GESTURE_2_FINGER_SWIPE_LEFT = 27; // 0x1b

    field public static final int GESTURE_2_FINGER_SWIPE_RIGHT = 28; // 0x1c
@@ -2897,11 +2898,13 @@ package android.accessibilityservice { 
    field public static final int GESTURE_3_FINGER_DOUBLE_TAP = 23; // 0x17

    field public static final int GESTURE_3_FINGER_DOUBLE_TAP_AND_HOLD = 41; // 0x29

    field public static final int GESTURE_3_FINGER_SINGLE_TAP = 22; // 0x16

    field public static final int GESTURE_3_FINGER_SINGLE_TAP_AND_HOLD = 44; // 0x2c

    field public static final int GESTURE_3_FINGER_SWIPE_DOWN = 30; // 0x1e

    field public static final int GESTURE_3_FINGER_SWIPE_LEFT = 31; // 0x1f

    field public static final int GESTURE_3_FINGER_SWIPE_RIGHT = 32; // 0x20

    field public static final int GESTURE_3_FINGER_SWIPE_UP = 29; // 0x1d

    field public static final int GESTURE_3_FINGER_TRIPLE_TAP = 24; // 0x18

    field public static final int GESTURE_3_FINGER_TRIPLE_TAP_AND_HOLD = 45; // 0x2d

    field public static final int GESTURE_4_FINGER_DOUBLE_TAP = 38; // 0x26

    field public static final int GESTURE_4_FINGER_DOUBLE_TAP_AND_HOLD = 42; // 0x2a

    field public static final int GESTURE_4_FINGER_SINGLE_TAP = 37; // 0x25

core/java/android/accessibilityservice/AccessibilityGestureEvent.java

+12 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package android.accessibilityservice; 
import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_DOUBLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SINGLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SINGLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SWIPE_DOWN;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SWIPE_LEFT;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SWIPE_RIGHT;
@@ -28,11 +29,13 @@ import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER 
import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_DOUBLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SINGLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SINGLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SWIPE_DOWN;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SWIPE_LEFT;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SWIPE_RIGHT;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SWIPE_UP;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_TRIPLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_TRIPLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_4_FINGER_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_4_FINGER_DOUBLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_4_FINGER_SINGLE_TAP;
@@ -85,13 +88,16 @@ public final class AccessibilityGestureEvent implements Parcelable { 
    /** @hide */

    @IntDef(prefix = { "GESTURE_" }, value = {

            GESTURE_2_FINGER_SINGLE_TAP,

            GESTURE_2_FINGER_SINGLE_TAP_AND_HOLD,

            GESTURE_2_FINGER_DOUBLE_TAP,

            GESTURE_2_FINGER_DOUBLE_TAP_AND_HOLD,

            GESTURE_2_FINGER_TRIPLE_TAP,

            GESTURE_3_FINGER_SINGLE_TAP,

            GESTURE_3_FINGER_SINGLE_TAP_AND_HOLD,

            GESTURE_3_FINGER_DOUBLE_TAP,

            GESTURE_3_FINGER_DOUBLE_TAP_AND_HOLD,

            GESTURE_3_FINGER_TRIPLE_TAP,

            GESTURE_3_FINGER_TRIPLE_TAP_AND_HOLD,

            GESTURE_DOUBLE_TAP,

            GESTURE_DOUBLE_TAP_AND_HOLD,

            GESTURE_SWIPE_UP,
@@ -180,15 +186,21 @@ public final class AccessibilityGestureEvent implements Parcelable { 
    private static String eventTypeToString(int eventType) {

        switch (eventType) {

            case GESTURE_2_FINGER_SINGLE_TAP: return "GESTURE_2_FINGER_SINGLE_TAP";

            case GESTURE_2_FINGER_SINGLE_TAP_AND_HOLD:

                return "GESTURE_2_FINGER_SINGLE_TAP_AND_HOLD";

            case GESTURE_2_FINGER_DOUBLE_TAP: return "GESTURE_2_FINGER_DOUBLE_TAP";

            case GESTURE_2_FINGER_DOUBLE_TAP_AND_HOLD:

                return "GESTURE_2_FINGER_DOUBLE_TAP_AND_HOLD";

            case GESTURE_2_FINGER_TRIPLE_TAP: return "GESTURE_2_FINGER_TRIPLE_TAP";

            case GESTURE_3_FINGER_SINGLE_TAP: return "GESTURE_3_FINGER_SINGLE_TAP";

            case GESTURE_3_FINGER_SINGLE_TAP_AND_HOLD:

                return "GESTURE_3_FINGER_SINGLE_TAP_AND_HOLD";

            case GESTURE_3_FINGER_DOUBLE_TAP: return "GESTURE_3_FINGER_DOUBLE_TAP";

            case GESTURE_3_FINGER_DOUBLE_TAP_AND_HOLD:

                return "GESTURE_3_FINGER_DOUBLE_TAP_AND_HOLD";

            case GESTURE_3_FINGER_TRIPLE_TAP: return "GESTURE_3_FINGER_TRIPLE_TAP";

            case GESTURE_3_FINGER_TRIPLE_TAP_AND_HOLD:

                return "GESTURE_3_FINGER_TRIPLE_TAP_AND_HOLD";

            case GESTURE_4_FINGER_SINGLE_TAP: return "GESTURE_4_FINGER_SINGLE_TAP";

            case GESTURE_4_FINGER_DOUBLE_TAP: return "GESTURE_4_FINGER_DOUBLE_TAP";

            case GESTURE_4_FINGER_DOUBLE_TAP_AND_HOLD:

core/java/android/accessibilityservice/AccessibilityService.java

+9 −0
Original line number Diff line number Diff line
@@ -421,6 +421,15 @@ public abstract class AccessibilityService extends Service { 
    /** The user has performed a three-finger double tap and hold gesture on the touch screen. */

    public static final int GESTURE_3_FINGER_DOUBLE_TAP_AND_HOLD = 41;



    /** The user has performed a two-finger  single-tap and hold gesture on the touch screen. */

    public static final int GESTURE_2_FINGER_SINGLE_TAP_AND_HOLD = 43;



    /** The user has performed a three-finger  single-tap and hold gesture on the touch screen. */

    public static final int GESTURE_3_FINGER_SINGLE_TAP_AND_HOLD = 44;



    /** The user has performed a three-finger  triple-tap and hold gesture on the touch screen. */

    public static final int GESTURE_3_FINGER_TRIPLE_TAP_AND_HOLD = 45;



    /** The user has performed a two-finger double tap and hold gesture on the touch screen. */

    public static final int GESTURE_4_FINGER_DOUBLE_TAP_AND_HOLD = 42;

non-updatable-api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -2889,6 +2889,7 @@ package android.accessibilityservice { 
    field public static final int GESTURE_2_FINGER_DOUBLE_TAP = 20; // 0x14

    field public static final int GESTURE_2_FINGER_DOUBLE_TAP_AND_HOLD = 40; // 0x28

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

    field public static final int GESTURE_2_FINGER_SINGLE_TAP_AND_HOLD = 43; // 0x2b

    field public static final int GESTURE_2_FINGER_SWIPE_DOWN = 26; // 0x1a

    field public static final int GESTURE_2_FINGER_SWIPE_LEFT = 27; // 0x1b

    field public static final int GESTURE_2_FINGER_SWIPE_RIGHT = 28; // 0x1c
@@ -2897,11 +2898,13 @@ package android.accessibilityservice { 
    field public static final int GESTURE_3_FINGER_DOUBLE_TAP = 23; // 0x17

    field public static final int GESTURE_3_FINGER_DOUBLE_TAP_AND_HOLD = 41; // 0x29

    field public static final int GESTURE_3_FINGER_SINGLE_TAP = 22; // 0x16

    field public static final int GESTURE_3_FINGER_SINGLE_TAP_AND_HOLD = 44; // 0x2c

    field public static final int GESTURE_3_FINGER_SWIPE_DOWN = 30; // 0x1e

    field public static final int GESTURE_3_FINGER_SWIPE_LEFT = 31; // 0x1f

    field public static final int GESTURE_3_FINGER_SWIPE_RIGHT = 32; // 0x20

    field public static final int GESTURE_3_FINGER_SWIPE_UP = 29; // 0x1d

    field public static final int GESTURE_3_FINGER_TRIPLE_TAP = 24; // 0x18

    field public static final int GESTURE_3_FINGER_TRIPLE_TAP_AND_HOLD = 45; // 0x2d

    field public static final int GESTURE_4_FINGER_DOUBLE_TAP = 38; // 0x26

    field public static final int GESTURE_4_FINGER_DOUBLE_TAP_AND_HOLD = 42; // 0x2a

    field public static final int GESTURE_4_FINGER_SINGLE_TAP = 37; // 0x25

services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java

+14 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.accessibility.gestures; 
import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_DOUBLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SINGLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SINGLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SWIPE_DOWN;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SWIPE_LEFT;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SWIPE_RIGHT;
@@ -27,11 +28,13 @@ import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER 
import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_DOUBLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SINGLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SINGLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SWIPE_DOWN;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SWIPE_LEFT;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SWIPE_RIGHT;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SWIPE_UP;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_TRIPLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_TRIPLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_4_FINGER_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_4_FINGER_DOUBLE_TAP_AND_HOLD;

import static android.accessibilityservice.AccessibilityService.GESTURE_4_FINGER_SINGLE_TAP;
@@ -139,6 +142,9 @@ class GestureManifold implements GestureMatcher.StateChangeListener { 
        // Two-finger taps.

        mMultiFingerGestures.add(

                new MultiFingerMultiTap(mContext, 2, 1, GESTURE_2_FINGER_SINGLE_TAP, this));

        mMultiFingerGestures.add(

                new MultiFingerMultiTapAndHold(

                        mContext, 2, 1, GESTURE_2_FINGER_SINGLE_TAP_AND_HOLD, this));

        mMultiFingerGestures.add(

                new MultiFingerMultiTap(mContext, 2, 2, GESTURE_2_FINGER_DOUBLE_TAP, this));

        mMultiFingerGestures.add(
@@ -151,11 +157,19 @@ class GestureManifold implements GestureMatcher.StateChangeListener { 
                new MultiFingerMultiTap(mContext, 3, 1, GESTURE_3_FINGER_SINGLE_TAP, this));

        mMultiFingerGestures.add(

                new MultiFingerMultiTap(mContext, 3, 2, GESTURE_3_FINGER_DOUBLE_TAP, this));

        mMultiFingerGestures.add(

                new MultiFingerMultiTapAndHold(

                        mContext, 3, 1, GESTURE_3_FINGER_SINGLE_TAP_AND_HOLD, this));

        mMultiFingerGestures.add(

                new MultiFingerMultiTapAndHold(

                        mContext, 3, 2, GESTURE_3_FINGER_DOUBLE_TAP_AND_HOLD, this));

        mMultiFingerGestures.add(

                new MultiFingerMultiTap(mContext, 3, 3, GESTURE_3_FINGER_TRIPLE_TAP, this));

        mMultiFingerGestures.add(

                new MultiFingerMultiTapAndHold(

                        mContext, 3, 3, GESTURE_3_FINGER_TRIPLE_TAP_AND_HOLD, this));

        mMultiFingerGestures.add(

                new MultiFingerMultiTap(mContext, 3, 3, GESTURE_3_FINGER_TRIPLE_TAP, this));

        // Four-finger taps.

        mMultiFingerGestures.add(

                new MultiFingerMultiTap(mContext, 4, 1, GESTURE_4_FINGER_SINGLE_TAP, this));