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

Merge "Let getOffsetToDismissedTask not rely on taskCount" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-12-17 14:37:52 -08:00
committed by Android (Google) Code Review
parent bd10730a57 7fc34db11b
commit 446ea7592f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/views/RecentsView.java
+9 -7
View File
@@ -3918,6 +3918,7 @@ public abstract class RecentsView<
: -newClearAllShortTotalWidthTranslation;
}
mDismissPrimaryTranslations = new int[taskCount];
int lastTaskViewIndex = indexOfChild(mUtils.getLastTaskView());
for (int i = 0; i < count; i++) {
View child = getChildAt(i);
if (child == dismissedTaskView) {
@@ -3927,7 +3928,8 @@ public abstract class RecentsView<
} else if (!showAsGrid || (enableLargeDesktopWindowingTile()
&& dismissedTaskView != null && dismissedTaskView.isLargeTile()
&& nextFocusedTaskView == null && !dismissingForSplitSelection)) {
int offset = getOffsetToDismissedTask(scrollDiffPerPage, dismissedIndex, taskCount);
int offset = getOffsetToDismissedTask(scrollDiffPerPage, dismissedIndex,
lastTaskViewIndex);
int scrollDiff = newScroll[i] - oldScroll[i] + offset;
if (scrollDiff != 0) {
translateTaskWhenDismissed(
@@ -4277,14 +4279,14 @@ public abstract class RecentsView<
* - Current page is rightmost page (leftmost for RTL)
* - Dragging an adjacent page on the left side (right side for RTL)
*/
private int getOffsetToDismissedTask(int scrollDiffPerPage, int dismissedIndex, int taskCount) {
// When mCurrentPage is ClearAllButton, use the last TaskView instead to calculate
// offset.
int currentPage = mCurrentPage == taskCount ? taskCount - 1 : mCurrentPage;
private int getOffsetToDismissedTask(int scrollDiffPerPage, int dismissedIndex,
int lastTaskViewIndex) {
// If `mCurrentPage` is beyond `lastTaskViewIndex`, use the last TaskView instead to
// calculate offset.
int currentPage = Math.min(mCurrentPage, lastTaskViewIndex);
int offset = mIsRtl ? scrollDiffPerPage : 0;
if (currentPage == dismissedIndex) {
int lastPage = taskCount - 1;
if (currentPage == lastPage) {
if (currentPage == lastTaskViewIndex) {
offset += mIsRtl ? -scrollDiffPerPage : scrollDiffPerPage;
}
} else {