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

Commit b8b3e957 authored by Tony Wickham's avatar Tony Wickham
Browse files

Fix TaskViewTouchController success progress to match haptic 

We use the interpolated progress of the animation contoller target
to determine success, but only the child animation had the
interpolator set. Updating the parent to use the same interpolator
ensures getInterpolatedProgress() returns the same one used to
play the haptic.

Fixes: 161536946
Change-Id: Ibc2aef67f53efa01f2b185cf03140bad4bb5c421
parent ffc06198

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java

+10 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.animation.Animator; 
import android.animation.AnimatorListenerAdapter;

import android.view.MotionEvent;

import android.view.View;

import android.view.animation.Interpolator;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.BaseDraggingActivity;
@@ -206,14 +207,19 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
        long maxDuration = 2 * secondaryLayerDimension;

        int verticalFactor = orientationHandler.getTaskDragDisplacementFactor(mIsRtl);

        int secondaryTaskDimension = orientationHandler.getSecondaryDimension(mTaskBeingDragged);

        // The interpolator controlling the most prominent visual movement. We use this to determine

        // whether we passed SUCCESS_TRANSITION_PROGRESS.

        final Interpolator currentInterpolator;

        if (goingUp) {

            currentInterpolator = Interpolators.LINEAR;

            mPendingAnimation = mRecentsView.createTaskDismissAnimation(mTaskBeingDragged,

                    true /* animateTaskView */, true /* removeTask */, maxDuration);



            mEndDisplacement = -secondaryTaskDimension;

        } else {

            currentInterpolator = Interpolators.ZOOM_IN;

            mPendingAnimation = mRecentsView.createTaskLaunchAnimation(

                    mTaskBeingDragged, maxDuration, Interpolators.ZOOM_IN);

                    mTaskBeingDragged, maxDuration, currentInterpolator);



            // Since the thumbnail is what is filling the screen, based the end displacement on it.

            View thumbnailView = mTaskBeingDragged.getThumbnail();
@@ -228,6 +234,9 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
        }

        mCurrentAnimation = mPendingAnimation.createPlaybackController()

                .setOnCancelRunnable(this::clearState);

        // Setting this interpolator doesn't affect the visual motion, but is used to determine

        // whether we successfully reached the target state in onDragEnd().

        mCurrentAnimation.getTarget().setInterpolator(currentInterpolator);

        onUserControlledAnimationCreated(mCurrentAnimation);

        mCurrentAnimation.getTarget().addListener(this);

        mCurrentAnimation.dispatchOnStart();