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

Commit db3a95c9 authored by Winson Chung's avatar Winson Chung
Browse files

Reset the interaction handler if it hasn't been recreated. 

Bug: 73356768
Change-Id: Ie3236c95cdb8d9ce809bf8651e02d1d803f0b802
parent ff02cd54

quickstep/src/com/android/quickstep/BaseSwipeInteractionHandler.java

+4 −2
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ import android.support.annotation.WorkerThread; 
import com.android.launcher3.states.InternalStateHandler;

import com.android.quickstep.TouchConsumer.InteractionType;



import java.util.function.Consumer;



public abstract class BaseSwipeInteractionHandler extends InternalStateHandler {



    protected Runnable mGestureEndCallback;

    protected Consumer<BaseSwipeInteractionHandler> mGestureEndCallback;



    public void setGestureEndCallback(Runnable gestureEndCallback) {

    public void setGestureEndCallback(Consumer<BaseSwipeInteractionHandler> gestureEndCallback) {

        mGestureEndCallback = gestureEndCallback;

    }

quickstep/src/com/android/quickstep/NavBarSwipeInteractionHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ public class NavBarSwipeInteractionHandler extends BaseSwipeInteractionHandler i 
    public void reset() {

        mCurrentShift.cancelAnimation();

        if (mGestureEndCallback != null) {

            mGestureEndCallback.run();

            mGestureEndCallback.accept(this);

        }

    }

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

+4 −2
Original line number Diff line number Diff line
@@ -397,9 +397,11 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC 
        }

    }



    private void onFinish() {

    private void onFinish(BaseSwipeInteractionHandler handler) {

        if (mInteractionHandler == handler) {

            mInteractionHandler = null;

        }

    }



    public void onTouchTrackingComplete() { }

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

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ public class WindowTransformSwipeHandler extends BaseSwipeInteractionHandler { 
        mCurrentShift.cancelAnimation();



        if (mGestureEndCallback != null) {

            mGestureEndCallback.run();

            mGestureEndCallback.accept(this);

        }



        clearReference();