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

Commit db28a992 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Wait until the remote transtions are received before trying to... 

Merge "Wait until the remote transtions are received before trying to quickscrub animations" into ub-launcher3-edmonton
parents e8532d84 6ec237a2

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

+2 −2
Original line number Diff line number Diff line
@@ -273,8 +273,8 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> { 
                | STATE_SCALED_CONTROLLER_APP,

                this::notifyTransitionCancelled);



        mStateCallback.addCallback(STATE_LAUNCHER_STARTED | STATE_QUICK_SCRUB_START,

                this::onQuickScrubStart);

        mStateCallback.addCallback(STATE_LAUNCHER_STARTED | STATE_QUICK_SCRUB_START

                        | STATE_APP_CONTROLLER_RECEIVED, this::onQuickScrubStart);

        mStateCallback.addCallback(STATE_LAUNCHER_STARTED | STATE_QUICK_SCRUB_START

                | STATE_SCALED_CONTROLLER_RECENTS, this::onFinishedTransitionToQuickScrub);

        mStateCallback.addCallback(STATE_LAUNCHER_STARTED | STATE_CURRENT_TASK_FINISHED