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

Commit 13e121e3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Snap to task from other grid row if dismissing non-snapped focused task... 

Merge "Snap to task from other grid row if dismissing non-snapped focused task and not enough tasks remain in current grid row to snap to." into sc-v2-dev
parents 48621c86 017dbbe7

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

+5 −1
Original line number Diff line number Diff line
@@ -3000,6 +3000,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                                                    : getBottomRowIdArray();

                                    int snappedIndex = taskViewIdArray.indexOf(snappedTaskViewId);

                                    taskViewIdArray.removeValue(dismissedTaskViewId);

                                    if (finalNextFocusedTaskView != null) {

                                        taskViewIdArray.removeValue(

                                                finalNextFocusedTaskView.getTaskViewId());

                                    }

                                    if (snappedIndex < taskViewIdArray.size()) {

                                        taskViewIdToSnapTo = taskViewIdArray.get(snappedIndex);

                                    } else if (snappedIndex == taskViewIdArray.size()) {
@@ -3088,7 +3092,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                            }

                        }

                        setCurrentPage(pageToSnapTo);

                        // Update various scroll depedent UI.

                        // Update various scroll-dependent UI.

                        dispatchScrollChanged();

                        updateActionsViewFocusedScroll();

                        if (isClearAllHidden()) {