Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d688120e authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

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

parents e3cf1621 df2b9e14

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

+5 −4
Original line number Diff line number Diff line
@@ -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);