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

Commit 1b74bd65 authored by Winson Chung's avatar Winson Chung
Browse files

Use actual quickstep callback to track gesture start 

- Better than using the threshold ourselves, we should just use the callback
  from the system.

Bug: 79970627
Change-Id: Ida15cfdaa2463f9fa15e222c55e483eb145c2716
parent f9d38098

quickstep/src/com/android/quickstep/MotionEventQueue.java

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class MotionEventQueue { 
                            mConsumer.updateTouchTracking(INTERACTION_QUICK_SCRUB);

                            break;

                        case ACTION_QUICK_STEP:

                            mConsumer.onQuickStep(event.getX(), event.getY(), event.getEventTime());

                            mConsumer.onQuickStep(event);

                            break;

                        default:

                            Log.e(TAG, "Invalid virtual event: " + event.getAction());

quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java

+9 −13
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC 
    private boolean mPassedInitialSlop;

    // Used for non-deferred gestures to determine when to start dragging

    private int mQuickStepDragSlop;

    // Used for deferred gestures to determine both start of animation and dragging

    private int mQuickStepTouchSlop;

    private float mStartDisplacement;

    private WindowTransformSwipeHandler mInteractionHandler;

    private int mDisplayRotation;
@@ -131,7 +129,6 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC 
                mLastPos.set(mDownPos);

                mPassedInitialSlop = false;

                mQuickStepDragSlop = NavigationBarCompat.getQuickStepDragSlopPx();

                mQuickStepTouchSlop = NavigationBarCompat.getQuickStepTouchSlopPx();



                // Start the window animation on down to give more time for launcher to draw if the

                // user didn't start the gesture over the back button
@@ -165,15 +162,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC 
                mLastPos.set(ev.getX(pointerIndex), ev.getY(pointerIndex));

                float displacement = getDisplacement(ev);

                if (!mPassedInitialSlop) {

                    if (mIsDeferredDownTarget) {

                        // Deferred gesture, start the animation and gesture tracking once we pass

                        // the touch slop

                        if (Math.abs(displacement) > mQuickStepTouchSlop) {

                            startTouchTrackingForWindowAnimation(ev.getEventTime());

                            mPassedInitialSlop = true;

                            mStartDisplacement = displacement;

                        }

                    } else {

                    if (!mIsDeferredDownTarget) {

                        // Normal gesture, ensure we pass the drag slop before we start tracking

                        // the gesture

                        if (Math.abs(displacement) > mQuickStepDragSlop) {
@@ -364,7 +353,14 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC 
    }



    @Override

    public void onQuickStep(float eventX, float eventY, long eventTime) {

    public void onQuickStep(MotionEvent ev) {

        if (mIsDeferredDownTarget) {

            // Deferred gesture, start the animation and gesture tracking once we pass the actual

            // touch slop

            startTouchTrackingForWindowAnimation(ev.getEventTime());

            mPassedInitialSlop = true;

            mStartDisplacement = getDisplacement(ev);

        }

        notifyGestureStarted();

    }

quickstep/src/com/android/quickstep/TouchConsumer.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public interface TouchConsumer extends Consumer<MotionEvent> { 


    default void onQuickScrubProgress(float progress) { }



    default void onQuickStep(float eventX, float eventY, long eventTime) { }

    default void onQuickStep(MotionEvent ev) { }



    /**

     * Called on the binder thread to allow the consumer to process the motion event before it is

quickstep/src/com/android/quickstep/TouchInteractionService.java

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ public class TouchInteractionService extends Service { 
        }



        @Override

        public void onQuickStep(float eventX, float eventY, long eventTime) {

        public void onQuickStep(MotionEvent ev) {

            if (mInvalidated) {

                return;

            }