summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2018-05-24 11:23:31 -0700
committerSunny Goyal <sunnygoyal@google.com>2018-05-24 11:24:22 -0700
commit6ec237a26046aece0fde6dcfe866ba3570874475 (patch)
tree15a01f318536ed3897efd9c78afa5cd26fa32252
parent7f28fd55ff383a80caf364408c5c15d978be6c8b (diff)
downloadandroid_packages_apps_Trebuchet-6ec237a26046aece0fde6dcfe866ba3570874475.tar.gz
android_packages_apps_Trebuchet-6ec237a26046aece0fde6dcfe866ba3570874475.tar.bz2
android_packages_apps_Trebuchet-6ec237a26046aece0fde6dcfe866ba3570874475.zip
Wait until the remote transtions are received before trying to quickscrub animations
Bug: 80219743 Change-Id: Ib94568827f30b996477d82f38675e3cd55031849
-rw-r--r--quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index e93c80789..191c237f6 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -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