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

Commit ada58203 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Disallow 2-finger swipe from the corners to trigger assistant from trackpad" into main

parents dc4f5604 dbd3c096

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; 
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.launcher3.MotionEventsUtils.isTrackpadScroll;

import static com.android.launcher3.util.DisplayController.CHANGE_ALL;

import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE;

import static com.android.launcher3.util.DisplayController.CHANGE_ROTATION;
@@ -563,6 +564,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E 
        return mAssistantAvailable

                && !QuickStepContract.isAssistantGestureDisabled(mSystemUiStateFlags)

                && mRotationTouchHelper.touchInAssistantRegion(ev)

                && !isTrackpadScroll(ev)

                && !isLockToAppActive();

    }