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

Commit 0337520c authored by samcackett's avatar samcackett
Browse files

Maintain if any task has been dismissed in RecentsView state 

Fixes an issue in large screen layouts where the task order was
incorrectly being recalculated and the user would see their previous
tasks swap places.

Fix: 352308373
Test: Manual. In tablet view, open several apps, go to Overview, dismiss
 a task so the top row order changes, then swipe down the current
 focused task to resume. Observe order stays the same.
Flag: EXEMPT bugfix
Change-Id: Ic59e3125f69d36ba32d13436dba872f4d3a3d0df
parent f67d384f

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

+20 −32
Original line number Diff line number Diff line
@@ -795,6 +795,13 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo 


    private int mOffsetMidpointIndexOverride = INVALID_PAGE;



    /**

     * Whether or not any task has been dismissed i.e. swiped away by the user, in the lifetime of

     * RecentsView being open and displayed to the user. It is reset in the {@link #reset()} method

     * i.e. when RecentsView closes.

     */

    private boolean mAnyTaskHasBeenDismissed;



    public RecentsView(Context context, @Nullable AttributeSet attrs, int defStyleAttr,

            BaseContainerInterface sizeStrategy) {

        super(context, attrs, defStyleAttr);
@@ -2181,15 +2188,6 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo 
     * Updates TaskView scaling and translation required to support variable width.

     */

    private void updateTaskSize() {

        updateTaskSize(false);

    }



    /**

     * Updates TaskView scaling and translation required to support variable width.

     *

     * @param isTaskDismissal indicates if update was called due to task dismissal

     */

    private void updateTaskSize(boolean isTaskDismissal) {

        final int taskCount = getTaskViewCount();

        if (taskCount == 0) {

            return;
@@ -2216,7 +2214,7 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo 


        mClearAllButton.setFullscreenTranslationPrimary(accumulatedTranslationX);



        updateGridProperties(isTaskDismissal);

        updateGridProperties();

    }



    public void getTaskSize(Rect outRect) {
@@ -2516,6 +2514,7 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo 
        mIgnoreResetTaskId = -1;

        mTaskListChangeId = -1;

        mFocusedTaskViewId = -1;

        mAnyTaskHasBeenDismissed = false;



        Log.d(TAG, "reset - mEnableDrawingLiveTile: " + mEnableDrawingLiveTile

                + ", mRecentsAnimationController: " + mRecentsAnimationController);
@@ -2991,22 +2990,11 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo 
    /**

     * Updates TaskView and ClearAllButtion scaling and translation required to turn into grid

     * layout.

     * This method is used when no task dismissal has occurred.

     */

    private void updateGridProperties() {

        updateGridProperties(false, Integer.MAX_VALUE);

    }



    /**

     * Updates TaskView and ClearAllButtion scaling and translation required to turn into grid

     * layout.

     *

     * This method is used when task dismissal has occurred, but rebalance is not needed.

     *

     * @param isTaskDismissal indicates if update was called due to task dismissal

     * Skips rebalance.

     */

    private void updateGridProperties(boolean isTaskDismissal) {

        updateGridProperties(isTaskDismissal, Integer.MAX_VALUE);

    private void updateGridProperties() {

        updateGridProperties(Integer.MAX_VALUE);

    }



    /**
@@ -3016,11 +3004,10 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo 
     * This method only calculates the potential position and depends on {@link #setGridProgress} to

     * apply the actual scaling and translation.

     *

     * @param isTaskDismissal    indicates if update was called due to task dismissal

     * @param startRebalanceAfter which view index to start rebalancing from. Use Integer.MAX_VALUE

     *                            to skip rebalance

     */

    private void updateGridProperties(boolean isTaskDismissal, int startRebalanceAfter) {

    private void updateGridProperties(int startRebalanceAfter) {

        int taskCount = getTaskViewCount();

        if (taskCount == 0) {

            return;
@@ -3051,7 +3038,8 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo 
        TaskView homeTaskView = getHomeTaskView();

        TaskView nextFocusedTaskView = null;



        if (!isTaskDismissal) {

        // Don't clear the top row, if the user has dismissed a task, to maintain the task order.

        if (!mAnyTaskHasBeenDismissed) {

            mTopRowIdSet.clear();

        }

        for (int i = 0; i < taskCount; i++) {
@@ -3091,7 +3079,7 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo 


                // Rebalance the grid starting after a certain index

                boolean isTopRow;

                if (isTaskDismissal) {

                if (mAnyTaskHasBeenDismissed) {

                    if (i > startRebalanceAfter) {

                        mTopRowIdSet.remove(taskViewId);

                        isTopRow = topRowWidth <= bottomRowWidth;
@@ -3872,6 +3860,7 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo 
                resetTaskVisuals();



                if (success) {

                    mAnyTaskHasBeenDismissed = true;

                    if (shouldRemoveTask) {

                        if (dismissedTaskView.isRunningTask()) {

                            finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
@@ -3980,7 +3969,7 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo 
                            mTopRowIdSet.remove(mFocusedTaskViewId);

                            finalNextFocusedTaskView.animateIconScaleAndDimIntoView();

                        }

                        updateTaskSize(/*isTaskDismissal=*/ true);

                        updateTaskSize();

                        updateChildTaskOrientations();

                        // Update scroll and snap to page.

                        updateScrollSynchronously();
@@ -4016,8 +4005,7 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo 
                                }



                                if (shouldRebalance) {

                                    updateGridProperties(/*isTaskDismissal=*/ true,

                                            highestVisibleTaskIndex);

                                    updateGridProperties(highestVisibleTaskIndex);

                                    updateScrollSynchronously();

                                }

                            }