diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-24 19:46:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-24 19:46:39 +0000 |
| commit | db28a992a9eb52f02f565f0185d4a30ee8fed24e (patch) | |
| tree | c3d99f7d2eaff839bb9a0b91da73f960cda0fe4a | |
| parent | e8532d84a94b095db4912dc863d826b7e7722036 (diff) | |
| parent | 6ec237a26046aece0fde6dcfe866ba3570874475 (diff) | |
| download | android_packages_apps_Trebuchet-db28a992a9eb52f02f565f0185d4a30ee8fed24e.tar.gz android_packages_apps_Trebuchet-db28a992a9eb52f02f565f0185d4a30ee8fed24e.tar.bz2 android_packages_apps_Trebuchet-db28a992a9eb52f02f565f0185d4a30ee8fed24e.zip | |
Merge "Wait until the remote transtions are received before trying to quickscrub animations" into ub-launcher3-edmonton
| -rw-r--r-- | quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java | 4 |
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 |