Merge "Fix duration when scrolling back to launch LAST_TASK" into ub-launcher3-master (fa8df691) · Commits · e / os / android_packages_apps_Trebuchet

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1001,8 +1001,9 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
	if (SWIPE_HOME.get()) {		if (SWIPE_HOME.get()) {
	setShelfState(ShelfAnimState.OVERVIEW, interpolator, duration);		setShelfState(ShelfAnimState.OVERVIEW, interpolator, duration);
	}		}
	} else if (endTarget == NEW_TASK) {		} else if (endTarget == NEW_TASK \|\| endTarget == LAST_TASK) {
	// Let RecentsView handle the scrolling to the task, which we launch in startNewTask().		// Let RecentsView handle the scrolling to the task, which we launch in startNewTask()
			// or resumeLastTaskForQuickstep().
	if (mRecentsView != null) {		if (mRecentsView != null) {
	duration = Math.max(duration, mRecentsView.getScroller().getDuration());		duration = Math.max(duration, mRecentsView.getScroller().getDuration());
	}		}