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

Commit dacb37c1 authored by Alex Chau's avatar Alex Chau
Browse files

Only call setCurrentPage in applyLoadPlan if mCurrentPage is outdated 

- Apply the same for all 3 setCurrentPage cases as they can all causes page jumping

Bug: 197493120
Test: manual
Change-Id: I5f7013ce3ce4d6fe84c67123618c3bebeeffc43a
Merged-In: I5f7013ce3ce4d6fe84c67123618c3bebeeffc43a
parent 97aaa6e5

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

+7 −3
Original line number Diff line number Diff line
@@ -1146,20 +1146,24 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        }

        updateTaskSize();



        int targetPage = -1;

        if (mNextPage == INVALID_PAGE) {

            // Set the current page to the running task, but not if settling on new task.

            TaskView runningTaskView = getRunningTaskView();

            if (runningTaskView != null) {

                setCurrentPage(indexOfChild(runningTaskView));

                targetPage = indexOfChild(runningTaskView);

            } else if (getTaskViewCount() > 0) {

                setCurrentPage(indexOfChild(getTaskViewAt(0)));

                targetPage = indexOfChild(getTaskViewAt(0));

            }

        } else if (currentTaskId != -1) {

            currentTaskView = getTaskView(currentTaskId);

            if (currentTaskView != null) {

                setCurrentPage(indexOfChild(currentTaskView));

                targetPage = indexOfChild(currentTaskView);

            }

        }

        if (targetPage != -1 && mCurrentPage != targetPage) {

            setCurrentPage(targetPage);

        }



        if (mIgnoreResetTaskId != -1 && getTaskView(mIgnoreResetTaskId) != ignoreResetTaskView) {

            // If the taskView mapping is changing, do not preserve the visuals. Since we are