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

Commit 48d6dc77 authored by Tony Wickham's avatar Tony Wickham
Browse files

Fix running task damped by overscroll when other tasks are offscreen 

Test: Swipe up and to the left from an app, ensure the running task
scrolls freely until the adjacent task comes in from offscreen
Bug: 185411781

Change-Id: I9749124a6b6f014b55e3430d1764766a232eb9dd
parent e8b22d5e

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

+36 −22
Original line number Diff line number Diff line
@@ -644,6 +644,31 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        // Draw overscroll

        if (mAllowOverScroll && (!mEdgeGlowRight.isFinished() || !mEdgeGlowLeft.isFinished())) {

            final int restoreCount = canvas.save();



            int primarySize = mOrientationHandler.getPrimaryValue(getWidth(), getHeight());

            int scroll = OverScroll.dampedScroll(getUndampedOverScrollShift(), primarySize);

            mOrientationHandler.set(canvas, CANVAS_TRANSLATE, scroll);



            if (mOverScrollShift != scroll) {

                mOverScrollShift = scroll;

                dispatchScrollChanged();

            }



            super.dispatchDraw(canvas);

            canvas.restoreToCount(restoreCount);

        } else {

            if (mOverScrollShift != 0) {

                mOverScrollShift = 0;

                dispatchScrollChanged();

            }

            super.dispatchDraw(canvas);

        }

        if (LIVE_TILE.get() && mEnableDrawingLiveTile && mLiveTileParams.getTargetSet() != null) {

            redrawLiveTile();

        }

    }



    private float getUndampedOverScrollShift() {

        final int width = getWidth();

        final int height = getHeight();

        int primarySize = mOrientationHandler.getPrimaryValue(width, height);
@@ -665,26 +690,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
            }

        }



            int scroll = OverScroll.dampedScroll(effectiveShift * primarySize, primarySize);

            mOrientationHandler.set(canvas, CANVAS_TRANSLATE, scroll);



            if (mOverScrollShift != scroll) {

                mOverScrollShift = scroll;

                dispatchScrollChanged();

            }



            super.dispatchDraw(canvas);

            canvas.restoreToCount(restoreCount);

        } else {

            if (mOverScrollShift != 0) {

                mOverScrollShift = 0;

                dispatchScrollChanged();

            }

            super.dispatchDraw(canvas);

        }

        if (LIVE_TILE.get() && mEnableDrawingLiveTile && mLiveTileParams.getTargetSet() != null) {

            redrawLiveTile();

        }

        return effectiveShift * primarySize;

    }



    /**
@@ -3512,8 +3518,16 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        if (pageIndex == -1) {

            return 0;

        }



        int overScrollShift = getOverScrollShift();

        if (mAdjacentPageVerticalOffset > 0) {

            // Don't dampen the scroll (due to overscroll) if the adjacent tasks are offscreen, so

            // that the page can move freely given there's no visual indication why it shouldn't.

            overScrollShift = (int) Utilities.mapRange(mAdjacentPageVerticalOffset, overScrollShift,

                    getUndampedOverScrollShift());

        }

        return getScrollForPage(pageIndex) - mOrientationHandler.getPrimaryScroll(this)

                + getOverScrollShift();

                + overScrollShift;

    }



    /**