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

Commit 8fa1dd2a authored by Ameer Armaly's avatar Ameer Armaly
Browse files

Add one-direction multi-finger swipes. 

Bug: 136131815
Bug: 142277518
Bug: 142277280
Test: atest GestureManifoldTest AccessibilityGestureDetectorTest TouchExplorerTest
Change-Id: I3e6997c863d50e3f2d8638ca57b508676f0909a1
parent e2deab50

api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -2875,9 +2875,17 @@ package android.accessibilityservice { 
    method public boolean takeScreenshot(int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.graphics.Bitmap>);

    field public static final int GESTURE_2_FINGER_DOUBLE_TAP = 20; // 0x14

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

    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_3_FINGER_DOUBLE_TAP = 23; // 0x17

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

    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_DOUBLE_TAP = 17; // 0x11

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

core/java/android/accessibilityservice/AccessibilityGestureEvent.java

+25 −1
Original line number Diff line number Diff line
@@ -19,9 +19,17 @@ package android.accessibilityservice; 


import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SINGLE_TAP;

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_3_FINGER_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SINGLE_TAP;

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_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_DOUBLE_TAP_AND_HOLD;
@@ -89,7 +97,15 @@ public final class AccessibilityGestureEvent implements Parcelable { 
            GESTURE_SWIPE_RIGHT,

            GESTURE_SWIPE_RIGHT_AND_UP,

            GESTURE_SWIPE_RIGHT_AND_LEFT,

            GESTURE_SWIPE_RIGHT_AND_DOWN

            GESTURE_SWIPE_RIGHT_AND_DOWN,

            GESTURE_2_FINGER_SWIPE_DOWN,

            GESTURE_2_FINGER_SWIPE_LEFT,

            GESTURE_2_FINGER_SWIPE_RIGHT,

            GESTURE_2_FINGER_SWIPE_UP,

            GESTURE_3_FINGER_SWIPE_DOWN,

            GESTURE_3_FINGER_SWIPE_LEFT,

            GESTURE_3_FINGER_SWIPE_RIGHT,

            GESTURE_3_FINGER_SWIPE_UP

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface GestureId {}
@@ -167,6 +183,14 @@ public final class AccessibilityGestureEvent implements Parcelable { 
            case GESTURE_SWIPE_UP_AND_LEFT: return "GESTURE_SWIPE_UP_AND_LEFT";

            case GESTURE_SWIPE_UP_AND_DOWN: return "GESTURE_SWIPE_UP_AND_DOWN";

            case GESTURE_SWIPE_UP_AND_RIGHT: return "GESTURE_SWIPE_UP_AND_RIGHT";

            case GESTURE_2_FINGER_SWIPE_DOWN: return "GESTURE_2_FINGER_SWIPE_DOWN";

            case GESTURE_2_FINGER_SWIPE_LEFT: return "GESTURE_2_FINGER_SWIPE_LEFT";

            case GESTURE_2_FINGER_SWIPE_RIGHT: return "GESTURE_2_FINGER_SWIPE_RIGHT";

            case GESTURE_2_FINGER_SWIPE_UP: return "GESTURE_2_FINGER_SWIPE_UP";

            case GESTURE_3_FINGER_SWIPE_DOWN: return "GESTURE_3_FINGER_SWIPE_DOWN";

            case GESTURE_3_FINGER_SWIPE_LEFT: return "GESTURE_3_FINGER_SWIPE_LEFT";

            case GESTURE_3_FINGER_SWIPE_RIGHT: return "GESTURE_3_FINGER_SWIPE_RIGHT";

            case GESTURE_3_FINGER_SWIPE_UP: return "GESTURE_3_FINGER_SWIPE_UP";

            default: return Integer.toHexString(eventType);

        }

    }

core/java/android/accessibilityservice/AccessibilityService.java

+40 −0
Original line number Diff line number Diff line
@@ -348,6 +348,46 @@ public abstract class AccessibilityService extends Service { 
     */

    public static final int GESTURE_3_FINGER_TRIPLE_TAP = 24;



    /**

     * The user has performed a two-finger swipe up gesture on the touch screen.

     */

    public static final int GESTURE_2_FINGER_SWIPE_UP = 25;



    /**

     * The user has performed a two-finger swipe down gesture on the touch screen.

     */

    public static final int GESTURE_2_FINGER_SWIPE_DOWN = 26;



    /**

     * The user has performed a two-finger swipe left gesture on the touch screen.

     */

    public static final int GESTURE_2_FINGER_SWIPE_LEFT = 27;



    /**

     * The user has performed a two-finger swipe right gesture on the touch screen.

     */

    public static final int GESTURE_2_FINGER_SWIPE_RIGHT = 28;



    /**

     * The user has performed a three-finger swipe up gesture on the touch screen.

     */

    public static final int GESTURE_3_FINGER_SWIPE_UP = 29;



    /**

     * The user has performed a three-finger swipe down gesture on the touch screen.

     */

    public static final int GESTURE_3_FINGER_SWIPE_DOWN = 30;



    /**

     * The user has performed a three-finger swipe left gesture on the touch screen.

     */

    public static final int GESTURE_3_FINGER_SWIPE_LEFT = 31;



    /**

     * The user has performed a three-finger swipe right gesture on the touch screen.

     */

    public static final int GESTURE_3_FINGER_SWIPE_RIGHT = 32;



    /**

     * The {@link Intent} that must be declared as handled by the service.

     */

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

+27 −0
Original line number Diff line number Diff line
@@ -18,9 +18,17 @@ package com.android.server.accessibility.gestures; 


import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_2_FINGER_SINGLE_TAP;

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_3_FINGER_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_3_FINGER_SINGLE_TAP;

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_DOUBLE_TAP;

import static android.accessibilityservice.AccessibilityService.GESTURE_DOUBLE_TAP_AND_HOLD;
@@ -110,6 +118,7 @@ class GestureManifold implements GestureMatcher.StateChangeListener { 
        mGestures.add(new Swipe(context, UP, DOWN, GESTURE_SWIPE_UP_AND_DOWN, this));

        mGestures.add(new Swipe(context, UP, LEFT, GESTURE_SWIPE_UP_AND_LEFT, this));

        mGestures.add(new Swipe(context, UP, RIGHT, GESTURE_SWIPE_UP_AND_RIGHT, this));

        // Set up multi-finger gestures to be enabled later.

        // Two-finger taps.

        mMultiFingerGestures.add(

                new MultiFingerMultiTap(mContext, 2, 1, GESTURE_2_FINGER_SINGLE_TAP, this));
@@ -124,6 +133,24 @@ class GestureManifold implements GestureMatcher.StateChangeListener { 
                new MultiFingerMultiTap(mContext, 3, 2, GESTURE_3_FINGER_DOUBLE_TAP, this));

        mMultiFingerGestures.add(

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

        // Two-finger swipes.

        mMultiFingerGestures.add(

                new MultiFingerSwipe(context, 2, DOWN, GESTURE_2_FINGER_SWIPE_DOWN, this));

        mMultiFingerGestures.add(

                new MultiFingerSwipe(context, 2, LEFT, GESTURE_2_FINGER_SWIPE_LEFT, this));

        mMultiFingerGestures.add(

                new MultiFingerSwipe(context, 2, RIGHT, GESTURE_2_FINGER_SWIPE_RIGHT, this));

        mMultiFingerGestures.add(

                new MultiFingerSwipe(context, 2, UP, GESTURE_2_FINGER_SWIPE_UP, this));

        // Three-finger swipes.

        mMultiFingerGestures.add(

                new MultiFingerSwipe(context, 3, DOWN, GESTURE_3_FINGER_SWIPE_DOWN, this));

        mMultiFingerGestures.add(

                new MultiFingerSwipe(context, 3, LEFT, GESTURE_3_FINGER_SWIPE_LEFT, this));

        mMultiFingerGestures.add(

                new MultiFingerSwipe(context, 3, RIGHT, GESTURE_3_FINGER_SWIPE_RIGHT, this));

        mMultiFingerGestures.add(

                new MultiFingerSwipe(context, 3, UP, GESTURE_3_FINGER_SWIPE_UP, this));

    }



    /**

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

+11 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ import android.view.MotionEvent; 
 */

public final class GestureUtils {



    public static int MM_PER_CM = 10;

    public static float CM_PER_INCH = 2.54f;



    private GestureUtils() {

        /* cannot be instantiated */

    }
@@ -85,4 +88,12 @@ public final class GestureUtils { 


        return true;

    }



    /**

     * Gets the index of the pointer that went up or down from a motion event.

     */

    public static int getActionIndex(MotionEvent event) {

        return (event.getAction()

                & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;

    }

}