PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 am: 13e121e35a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15771038

Change-Id: I778473e10913718cbbf266c1d8335f8f31ae5d37
This commit is contained in:
TreeHugger Robot
2021-09-06 16:24:23 +00:00
committed by Automerger Merge Worker
parent fe7c903c20 13e121e35a
commit ea25f8f6e0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/views/RecentsView.java
+5 -1
View File
@@ -3000,6 +3000,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
: getBottomRowIdArray(); : getBottomRowIdArray();
int snappedIndex = taskViewIdArray.indexOf(snappedTaskViewId); int snappedIndex = taskViewIdArray.indexOf(snappedTaskViewId);
taskViewIdArray.removeValue(dismissedTaskViewId); taskViewIdArray.removeValue(dismissedTaskViewId);
if (finalNextFocusedTaskView != null) {
taskViewIdArray.removeValue(
finalNextFocusedTaskView.getTaskViewId());
}
if (snappedIndex < taskViewIdArray.size()) { if (snappedIndex < taskViewIdArray.size()) {
taskViewIdToSnapTo = taskViewIdArray.get(snappedIndex); taskViewIdToSnapTo = taskViewIdArray.get(snappedIndex);
} else if (snappedIndex == taskViewIdArray.size()) { } else if (snappedIndex == taskViewIdArray.size()) {
@@ -3088,7 +3092,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
} }
} }
setCurrentPage(pageToSnapTo); setCurrentPage(pageToSnapTo);
// Update various scroll depedent UI. // Update various scroll-dependent UI.
dispatchScrollChanged(); dispatchScrollChanged();
updateActionsViewFocusedScroll(); updateActionsViewFocusedScroll();
if (isClearAllHidden()) { if (isClearAllHidden()) {