diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-07 00:56:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-07 00:56:57 +0000 |
| commit | fa8df691d12f99543bc760ae74a0e3f6125369b0 (patch) | |
| tree | c3846326ef4910fca4ebcf7cf4acd139eb0d03f1 | |
| parent | 1ea481ad8389cda0845d6e88d0cb4570eff03ef1 (diff) | |
| parent | 3c477492de23394ab5f6338b34a7276b728b27b2 (diff) | |
| download | android_packages_apps_Trebuchet-fa8df691d12f99543bc760ae74a0e3f6125369b0.tar.gz android_packages_apps_Trebuchet-fa8df691d12f99543bc760ae74a0e3f6125369b0.tar.bz2 android_packages_apps_Trebuchet-fa8df691d12f99543bc760ae74a0e3f6125369b0.zip | |
Merge "Fix duration when scrolling back to launch LAST_TASK" into ub-launcher3-master
| -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()); } |