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

Commit 47f21e8a authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Fix issue where Assistant could be invoked at the same time as all... 

Merge "Fix issue where Assistant could be invoked at the same time as all apps" into ub-launcher3-qt-dev
parents 0ef504aa 8f7d2b0d

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java

+5 −2
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.SystemClock; 
import android.util.Log;

import android.view.HapticFeedbackConstants;

import android.view.MotionEvent;

import android.view.ViewConfiguration;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.R;
@@ -97,7 +98,9 @@ public class AssistantTouchConsumer extends DelegateInputConsumer 
        mDistThreshold = res.getDimension(R.dimen.gestures_assistant_drag_threshold);

        mTimeThreshold = res.getInteger(R.integer.assistant_gesture_min_time_threshold);

        mAngleThreshold = res.getInteger(R.integer.assistant_gesture_corner_deg_threshold);

        float slop = QuickStepContract.getQuickStepDragSlopPx();



        float slop = ViewConfiguration.get(context).getScaledTouchSlop();



        mSquaredSlop = slop * slop;

        mActivityControlHelper = activityControlHelper;

        mSwipeDetector = new SwipeDetector(mContext, this, SwipeDetector.VERTICAL);
@@ -273,7 +276,7 @@ public class AssistantTouchConsumer extends DelegateInputConsumer 


    @Override

    public void onDragEnd(float velocity, boolean fling) {

        if (fling && !mLaunchedAssistant) {

        if (fling && !mLaunchedAssistant && mState != STATE_DELEGATE_ACTIVE) {

            mLastProgress = 1;

            try {

                mSysUiProxy.onAssistantGestureCompletion(velocity);