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

Commit 2820f739 authored by Ameer Armaly's avatar Ameer Armaly
Browse files

Enable two-finger passthrough swipes. 

Bug: 162521649
Test: atest GestureManifoldTest TouchExplorerTest AccessibilityGestureDetectorTest FrameworksServicesTests:TouchExplorerTest
Change-Id: I9e6b691295a0fa006578d7b8ad8468579c66939c
parent f059c2a7

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+15 −0
Original line number Diff line number Diff line
@@ -364,6 +364,18 @@ public class AccessibilityServiceInfo implements Parcelable { 
     */

    public static final int FLAG_REQUEST_MULTI_FINGER_GESTURES = 0x0001000;



    /**

     * This flag requests that when when {@link #FLAG_REQUEST_MULTI_FINGER_GESTURES} is enabled,

     * two-finger passthrough gestures are re-enabled. Two-finger swipe gestures are not detected,

     * but instead passed through as one-finger gestures. In addition, three-finger swipes from the

     * bottom of the screen are not detected, and instead are passed through unchanged. If {@link

     * #FLAG_REQUEST_MULTI_FINGER_GESTURES} is disabled this flag has no effect.

     *

     * @see #FLAG_REQUEST_TOUCH_EXPLORATION_MODE

     * @hide

     */

    public static final int FLAG_REQUEST_2_FINGER_PASSTHROUGH = 0x0002000;



    /** {@hide} */

    public static final int FLAG_FORCE_DIRECT_BOOT_AWARE = 0x00010000;
@@ -624,6 +636,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
                    0);

            flags = asAttributes.getInt(

                    com.android.internal.R.styleable.AccessibilityService_accessibilityFlags, 0);

            flags |= FLAG_REQUEST_2_FINGER_PASSTHROUGH;

            mSettingsActivityName = asAttributes.getString(

                    com.android.internal.R.styleable.AccessibilityService_settingsActivity);

            if (asAttributes.getBoolean(com.android.internal.R.styleable
@@ -1261,6 +1274,8 @@ public class AccessibilityServiceInfo implements Parcelable { 
                return "FLAG_SERVICE_HANDLES_DOUBLE_TAP";

            case FLAG_REQUEST_MULTI_FINGER_GESTURES:

                return "FLAG_REQUEST_MULTI_FINGER_GESTURES";

            case FLAG_REQUEST_2_FINGER_PASSTHROUGH:

                return "FLAG_REQUEST_2_FINGER_PASSTHROUGH";

            case FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY:

                return "FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY";

            case FLAG_REPORT_VIEW_IDS:

services/accessibility/java/com/android/server/accessibility/AbstractAccessibilityServiceConnection.java

+10 −2
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ 


    private boolean mRequestMultiFingerGestures;



    private boolean mRequestTwoFingerPassthrough;



    boolean mRequestFilterKeyEvents;



    boolean mRetrieveInteractiveWindows;
@@ -325,8 +327,10 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ 
                & AccessibilityServiceInfo.FLAG_SERVICE_HANDLES_DOUBLE_TAP) != 0;

        mRequestMultiFingerGestures = (info.flags

                & AccessibilityServiceInfo.FLAG_REQUEST_MULTI_FINGER_GESTURES) != 0;

        mRequestFilterKeyEvents = (info.flags

                & AccessibilityServiceInfo.FLAG_REQUEST_FILTER_KEY_EVENTS) != 0;

        mRequestTwoFingerPassthrough =

                (info.flags & AccessibilityServiceInfo.FLAG_REQUEST_2_FINGER_PASSTHROUGH) != 0;

        mRequestFilterKeyEvents =

                (info.flags & AccessibilityServiceInfo.FLAG_REQUEST_FILTER_KEY_EVENTS) != 0;

        mRetrieveInteractiveWindows = (info.flags

                & AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS) != 0;

        mCaptureFingerprintGestures = (info.flags
@@ -1772,6 +1776,10 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ 
        return mRequestMultiFingerGestures;

    }



    public boolean isTwoFingerPassthroughEnabled() {

        return mRequestTwoFingerPassthrough;

    }



    @Override

    public void setGestureDetectionPassthroughRegion(int displayId, Region region) {

        mSystemSupport.setGestureDetectionPassthroughRegion(displayId, region);

services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java

+12 −1
Original line number Diff line number Diff line
@@ -118,6 +118,13 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo 
     */

    static final int FLAG_REQUEST_MULTI_FINGER_GESTURES = 0x00000100;



    /**

     * Flag for enabling multi-finger gestures.

     *

     * @see #setUserAndEnabledFeatures(int, int)

     */

    static final int FLAG_REQUEST_2_FINGER_PASSTHROUGH = 0x00000200;



    static final int FEATURES_AFFECTING_MOTION_EVENTS =

            FLAG_FEATURE_INJECT_MOTION_EVENTS

                    | FLAG_FEATURE_AUTOCLICK
@@ -125,7 +132,8 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo 
                    | FLAG_FEATURE_SCREEN_MAGNIFIER

                    | FLAG_FEATURE_TRIGGERED_SCREEN_MAGNIFIER

                    | FLAG_SERVICE_HANDLES_DOUBLE_TAP

                    | FLAG_REQUEST_MULTI_FINGER_GESTURES;

                    | FLAG_REQUEST_MULTI_FINGER_GESTURES

                    | FLAG_REQUEST_2_FINGER_PASSTHROUGH;



    private final Context mContext;
@@ -421,6 +429,9 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo 
                if ((mEnabledFeatures & FLAG_REQUEST_MULTI_FINGER_GESTURES) != 0) {

                    explorer.setMultiFingerGesturesEnabled(true);

                }

                if ((mEnabledFeatures & FLAG_REQUEST_2_FINGER_PASSTHROUGH) != 0) {

                    explorer.setTwoFingerPassthroughEnabled(true);

                }

                addFirstEventHandler(displayId, explorer);

                mTouchExplorer.put(displayId, explorer);

            }

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -1837,6 +1837,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                if (userState.isMultiFingerGesturesEnabledLocked()) {

                    flags |= AccessibilityInputFilter.FLAG_REQUEST_MULTI_FINGER_GESTURES;

                }

                if (userState.isTwoFingerPassthroughEnabledLocked()) {

                    flags |= AccessibilityInputFilter.FLAG_REQUEST_2_FINGER_PASSTHROUGH;

                }

            }

            if (userState.isFilterKeyEventsEnabledLocked()) {

                flags |= AccessibilityInputFilter.FLAG_FEATURE_FILTER_KEY_EVENTS;
@@ -2120,6 +2123,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        boolean touchExplorationEnabled = mUiAutomationManager.isTouchExplorationEnabledLocked();

        boolean serviceHandlesDoubleTapEnabled = false;

        boolean requestMultiFingerGestures = false;

        boolean requestTwoFingerPassthrough = false;

        final int serviceCount = userState.mBoundServices.size();

        for (int i = 0; i < serviceCount; i++) {

            AccessibilityServiceConnection service = userState.mBoundServices.get(i);
@@ -2127,6 +2131,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                touchExplorationEnabled = true;

                serviceHandlesDoubleTapEnabled = service.isServiceHandlesDoubleTapEnabled();

                requestMultiFingerGestures = service.isMultiFingerGesturesEnabled();

                requestTwoFingerPassthrough = service.isTwoFingerPassthroughEnabled();

                break;

            }

        }
@@ -2143,6 +2148,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        }

        userState.setServiceHandlesDoubleTapLocked(serviceHandlesDoubleTapEnabled);

        userState.setMultiFingerGesturesLocked(requestMultiFingerGestures);

        userState.setTwoFingerPassthroughLocked(requestTwoFingerPassthrough);

    }



    private boolean readAccessibilityShortcutKeySettingLocked(AccessibilityUserState userState) {

services/accessibility/java/com/android/server/accessibility/AccessibilityUserState.java

+12 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ class AccessibilityUserState { 
    private boolean mIsTouchExplorationEnabled;

    private boolean mServiceHandlesDoubleTap;

    private boolean mRequestMultiFingerGestures;

    private boolean mRequestTwoFingerPassthrough;

    private int mUserInteractiveUiTimeout;

    private int mUserNonInteractiveUiTimeout;

    private int mNonInteractiveUiTimeout = 0;
@@ -169,6 +170,7 @@ class AccessibilityUserState { 
        mIsTouchExplorationEnabled = false;

        mServiceHandlesDoubleTap = false;

        mRequestMultiFingerGestures = false;

        mRequestTwoFingerPassthrough = false;

        mIsDisplayMagnificationEnabled = false;

        mIsAutoclickEnabled = false;

        mUserNonInteractiveUiTimeout = 0;
@@ -456,6 +458,8 @@ class AccessibilityUserState { 
                .append(String.valueOf(mServiceHandlesDoubleTap));

        pw.append(", requestMultiFingerGestures=")

                .append(String.valueOf(mRequestMultiFingerGestures));

        pw.append(", requestTwoFingerPassthrough=")

                .append(String.valueOf(mRequestTwoFingerPassthrough));

        pw.append(", displayMagnificationEnabled=").append(String.valueOf(

                mIsDisplayMagnificationEnabled));

        pw.append(", autoclickEnabled=").append(String.valueOf(mIsAutoclickEnabled));
@@ -790,6 +794,14 @@ class AccessibilityUserState { 
    public void setMultiFingerGesturesLocked(boolean enabled) {

        mRequestMultiFingerGestures = enabled;

    }

    public boolean isTwoFingerPassthroughEnabledLocked() {

        return mRequestTwoFingerPassthrough;

    }



    public void setTwoFingerPassthroughLocked(boolean enabled) {

        mRequestTwoFingerPassthrough = enabled;

    }





    public int getUserInteractiveUiTimeoutLocked() {

        return mUserInteractiveUiTimeout;