Merge "Maintain TaskView's scroll invariant when swiping down" into sc-dev (c9744631) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/views/RecentsView.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -1658,8 +1658,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		if (endTarget == GestureState.GestureEndTarget.NEW_TASK
		\|\| endTarget == GestureState.GestureEndTarget.LAST_TASK) {
		// When switching to tasks in quick switch, ensures the snapped page's scroll maintain
		// invariant between quick switch and overview grid, to ensure a smooth animation
		// transition.
		// invariant between quick switch and overview, to ensure a smooth animation transition.
		updateGridProperties();
		}
		}
		@@ -3114,6 +3113,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		return new PendingAnimation(duration);
		}

		// When swiping down from overview to tasks, ensures the snapped page's scroll maintain
		// invariant between quick switch and overview, to ensure a smooth animation transition.
		updateGridProperties();
		updateScrollSynchronously();

		int targetSysUiFlags = tv.getThumbnail().getSysUiStatusNavFlags();
		final boolean[] passedOverviewThreshold = new boolean[] {false};
		ValueAnimator progressAnim = ValueAnimator.ofFloat(0, 1);