commit 450b1b4e7307a4be3ac5dbdcef07a0d3be57fe77
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 24 18:24:29 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 24 18:24:29 2018 +0000
tree ce7a6a6145d08f8d1436b8c514a030a932dab3d7
parent be7883b3d4b151acf0e2806cd85ec0bfa0a7991a
parent 6ec237a26046aece0fde6dcfe866ba3570874475

[automerger] Wait until the remote transtions are received before trying to quickscrub animations am: 6ec237a260

Change-Id: Iaf47487ed8404167c597006df6b903d5b426c8cf

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

diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index e93c807..191c237 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -273,8 +273,8 @@
                 | 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