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

Commit 0170af7b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move Gesture ID 43 from two-finger single tap and hold to two-finger... 

Merge "Move Gesture ID 43 from two-finger single tap and hold to two-finger triple tap and hold." into sc-dev
parents cab33970 bc1a2bdc

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2936,12 +2936,12 @@ 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

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

    field public static final int GESTURE_2_FINGER_TRIPLE_TAP = 21; // 0x15

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

    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

core/java/android/accessibilityservice/AccessibilityGestureEvent.java

+4 −4
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 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;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SWIPE_UP;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_TRIPLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_TRIPLE_TAP_AND_HOLD;

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;
@@ -97,10 +97,10 @@ public final class AccessibilityGestureEvent implements Parcelable { 
          GESTURE_UNKNOWN,

          GESTURE_TOUCH_EXPLORATION,

            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_2_FINGER_TRIPLE_TAP_AND_HOLD,

            GESTURE_3_FINGER_SINGLE_TAP,

            GESTURE_3_FINGER_SINGLE_TAP_AND_HOLD,

            GESTURE_3_FINGER_DOUBLE_TAP,
@@ -232,8 +232,8 @@ public final class AccessibilityGestureEvent implements Parcelable { 
            case GESTURE_PASSTHROUGH: return "GESTURE_PASSTHROUGH";

            case GESTURE_TOUCH_EXPLORATION: return "GESTURE_TOUCH_EXPLORATION";

            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_TRIPLE_TAP_AND_HOLD:

                return "GESTURE_2_FINGER_TRIPLE_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";

core/java/android/accessibilityservice/AccessibilityService.java

+2 −2
Original line number Diff line number Diff line
@@ -445,8 +445,8 @@ 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 two-finger  triple-tap and hold gesture on the touch screen. */

    public static final int GESTURE_2_FINGER_TRIPLE_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;

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

+4 −4
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 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;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SWIPE_UP;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_TRIPLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_TRIPLE_TAP_AND_HOLD;

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;
@@ -146,9 +146,6 @@ 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(
@@ -156,6 +153,9 @@ class GestureManifold implements GestureMatcher.StateChangeListener { 
                        mContext, 2, 2, GESTURE_2_FINGER_DOUBLE_TAP_AND_HOLD, this));

        mMultiFingerGestures.add(

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

        mMultiFingerGestures.add(

                new MultiFingerMultiTapAndHold(

                        mContext, 2, 3, GESTURE_2_FINGER_TRIPLE_TAP_AND_HOLD, this));

        // Three-finger taps.

        mMultiFingerGestures.add(

                new MultiFingerMultiTap(mContext, 3, 1, GESTURE_3_FINGER_SINGLE_TAP, this));