commit 4a98d8f9193378194060572e0b4487f7cc65cfe7
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 29 22:46:35 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 29 22:46:35 2022 +0000
tree 42a5c139e41f5a1a90bdfc68b935748280454c97
parent 8157be497d0172dbc30db54e6ee454b8355480b5
parent d5e7ad4ae9b9192c62dc19e6703cc36314f2b0a2

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

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

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 5975106..64068ad 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2238,7 +2238,8 @@
             @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 @@
                 }
             }
         }
+        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));
         }
     }