Merge "Fix animation problem when swipeing up app to screen edge and release" into sc-qpr1-dev am: d688120ee1

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

Change-Id: I23f896fbfb500fa0e0518edee718dc7ab4f8c54b
This commit is contained in:
Alex Chau
2021-08-25 09:21:09 +00:00
committed by Automerger Merge Worker

View File

@@ -1764,8 +1764,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
// When switching to tasks in quick switch, ensures the snapped page's scroll maintain
// invariant between quick switch and overview, to ensure a smooth animation transition.
updateGridProperties();
} else if (endTarget == GestureState.GestureEndTarget.RECENTS) {
setEnableFreeScroll(true);
}
}
@@ -2906,8 +2904,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
boolean isStartShift;
if (midpointIndex > -1) {
// When there is a midpoint reference task, adjacent tasks have less distance to travel
// to reach offscreen. Offset the task position to the task's starting point.
int midpointScroll = getScrollForPage(midpointIndex);
// to reach offscreen. Offset the task position to the task's starting point, and offset
// by current page's scroll diff.
int midpointScroll = getScrollForPage(midpointIndex)
+ mOrientationHandler.getPrimaryScroll(this) - getScrollForPage(mCurrentPage);
getPersistentChildPosition(midpointIndex, midpointScroll, taskPosition);
float midpointStart = mOrientationHandler.getStart(taskPosition);