aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 08:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add detailed exception for snappedIndex == -1 when dismissing tasks" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-21 11:00:20 +00:00
committed by Android (Google) Code Review
parent a842561c1b 8f19421a87
commit dcbe9583fb
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
quickstep/src/com/android/quickstep/views/RecentsView.java
View File

@@ -3742,19 +3742,33 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
taskViewIdArray.removeValue(
finalNextFocusedTaskView.getTaskViewId());
}
if (snappedIndex < taskViewIdArray.size()) {
taskViewIdToSnapTo = taskViewIdArray.get(snappedIndex);
} else if (snappedIndex == taskViewIdArray.size()) {
// If the snapped task is the last item from the
// dismissed row,
// snap to the same column in the other grid row
IntArray inverseRowTaskViewIdArray =
isSnappedTaskInTopRow ? getBottomRowIdArray()
: getTopRowIdArray();
if (snappedIndex < inverseRowTaskViewIdArray.size()) {
taskViewIdToSnapTo = inverseRowTaskViewIdArray.get(
snappedIndex);
try {
if (snappedIndex < taskViewIdArray.size()) {
taskViewIdToSnapTo = taskViewIdArray.get(snappedIndex);
} else if (snappedIndex == taskViewIdArray.size()) {
// If the snapped task is the last item from the
// dismissed row,
// snap to the same column in the other grid row
IntArray inverseRowTaskViewIdArray =
isSnappedTaskInTopRow ? getBottomRowIdArray()
: getTopRowIdArray();
if (snappedIndex < inverseRowTaskViewIdArray.size()) {
taskViewIdToSnapTo = inverseRowTaskViewIdArray.get(
snappedIndex);
}
}
} catch (ArrayIndexOutOfBoundsException e) {
throw new IllegalStateException(
"b/269956477 invalid snappedIndex"
+ "\nsnappedTaskViewId: "
+ snappedTaskViewId
+ "\nfocusedTaskViewId: "
+ mFocusedTaskViewId
+ "\ntopRowIdArray: "
+ getTopRowIdArray().toConcatString()
+ "\nbottomRowIdArray: "
+ getBottomRowIdArray().toConcatString(),
e);
}
}
}