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

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

Restore previous currentPage in applyLoadPlan in case task is re-ordered 

Fix: 186537288
Test: Repeatededly launch task from home and swipe to home, animation is correct
Test: Quick switch, launch task then swipe up, there is no jump
Change-Id: I9fd7416d9811ce4e54a1c6d20374d89d00417cd5
parent 9bb83f65

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

+11 −0
Original line number Diff line number Diff line
@@ -1087,6 +1087,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
            return;

        }



        int currentTaskId = -1;

        TaskView currentTaskView = getTaskViewAtByAbsoluteIndex(mCurrentPage);

        if (currentTaskView != null) {

            currentTaskId = currentTaskView.getTask().key.id;

        }



        // Unload existing visible task data

        unloadVisibleTaskData(TaskView.FLAG_UPDATE_ALL);
@@ -1126,6 +1132,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
            } else if (getTaskViewCount() > 0) {

                setCurrentPage(indexOfChild(getTaskViewAt(0)));

            }

        } else if (currentTaskId != -1) {

            currentTaskView = getTaskView(currentTaskId);

            if (currentTaskView != null) {

                setCurrentPage(indexOfChild(currentTaskView));

            }

        }



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