diff options
| author | Tony <twickham@google.com> | 2019-02-06 11:19:17 -0500 |
|---|---|---|
| committer | Tony <twickham@google.com> | 2019-02-06 11:20:56 -0500 |
| commit | 3c477492de23394ab5f6338b34a7276b728b27b2 (patch) | |
| tree | 44350e6a1a0f721afb6370bbaedcc441349b6b19 | |
| parent | db3d82a8ab41afd4eb8d52c988474ada6e27b042 (diff) | |
| download | android_packages_apps_Trebuchet-3c477492de23394ab5f6338b34a7276b728b27b2.tar.gz android_packages_apps_Trebuchet-3c477492de23394ab5f6338b34a7276b728b27b2.tar.bz2 android_packages_apps_Trebuchet-3c477492de23394ab5f6338b34a7276b728b27b2.zip | |
Fix duration when scrolling back to launch LAST_TASK
Bug: 111926330
Change-Id: Ief8b5eb3dc2c50a1a06ea9e3adbf89f6c1cf157b
| -rw-r--r-- | quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java index f9495a4d2..6564950ce 100644 --- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -1001,8 +1001,9 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> { if (SWIPE_HOME.get()) { setShelfState(ShelfAnimState.OVERVIEW, interpolator, duration); } - } else if (endTarget == NEW_TASK) { - // Let RecentsView handle the scrolling to the task, which we launch in startNewTask(). + } else if (endTarget == NEW_TASK || endTarget == LAST_TASK) { + // Let RecentsView handle the scrolling to the task, which we launch in startNewTask() + // or resumeLastTaskForQuickstep(). if (mRecentsView != null) { duration = Math.max(duration, mRecentsView.getScroller().getDuration()); } |