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

Commit 3fca6aae authored by Tony Wickham's avatar Tony Wickham
Browse files

Finish recents animation when touching during animation to recents 

This regressed in ag/8542000, where we cancel the animation instead of
ending it. We should only cancel when going to home; in other cases, we
should still call end().

Bug: 137487381
Change-Id: I093954908c3ac747ec3132aa700c8be2f927631a
parent 3ab3c768

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java

+4 −4
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ import android.view.ViewTreeObserver.OnDrawListener; 
import android.view.WindowInsets;

import android.view.animation.Interpolator;



import androidx.annotation.NonNull;

import androidx.annotation.UiThread;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.DeviceProfile;
@@ -88,9 +91,6 @@ import com.android.systemui.shared.system.LatencyTrackerCompat; 
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

import com.android.systemui.shared.system.WindowCallbacksCompat;



import androidx.annotation.NonNull;

import androidx.annotation.UiThread;



@TargetApi(Build.VERSION_CODES.O)

public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>

        extends BaseSwipeUpHandler<T, RecentsView>
@@ -677,7 +677,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 


    @Override

    protected InputConsumer createNewInputProxyHandler() {

        endRunningWindowAnim(true /* cancel */);

        endRunningWindowAnim(mGestureEndTarget == HOME /* cancel */);

        endLauncherTransitionController();

        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            // Hide the task view, if not already hidden