Merge "Set overview progress on fling to 1 only if going to overview state." into tm-qpr-dev am: 4a98d8f919

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19394242

Change-Id: I6097c3a59675f5c6883d975a5ff57152ae061b77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-07-29 23:05:28 +00:00
committed by Automerger Merge Worker

View File

@@ -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));
}
}