Merge "Set overview progress on fling to 1 only if going to overview state." into tm-qpr-dev (4a98d8f9) · Commits · e / os / android_packages_apps_Trebuchet

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -2238,7 +2238,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		@Nullable AnimatorSet animatorSet, GestureState.GestureEndTarget endTarget,
		TaskViewSimulator[] taskViewSimulators) {
		mCurrentGestureEndTarget = endTarget;
		if (endTarget == GestureState.GestureEndTarget.RECENTS) {
		boolean isOverviewEndTarget = endTarget == GestureState.GestureEndTarget.RECENTS;
		if (isOverviewEndTarget) {
		updateGridProperties();
		}

		@@ -2267,10 +2268,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		}
		}
		}
		int overviewProgress = isOverviewEndTarget ? 1 : 0;
		if (animatorSet == null) {
		setOverviewProgress(1);
		setOverviewProgress(overviewProgress);
		} else {
		animatorSet.play(ObjectAnimator.ofFloat(this, OVERVIEW_PROGRESS, 1));
		animatorSet.play(ObjectAnimator.ofFloat(this, OVERVIEW_PROGRESS, overviewProgress));
		}
		}