commit fb172faa7ffabe78267cc6fd325f07f24b56fd77
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Oct 18 09:26:05 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 18 09:26:05 2024 +0000
tree c85a553b41088e4f35b5b0fe22878209363e5c5d
parent 4d2af8ec6c23b9f8d27002477335f58fe3837287
parent ab23dc8648b67f20a598e8e3ddaef4e54c3e86c6

Merge "Fix split selection translation when focused task is selected for splitscreen" into main

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

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index b18af65..5458ba1 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3810,7 +3810,7 @@
                 }
             } else if (!showAsGrid || (enableLargeDesktopWindowingTile()
                     && dismissedTaskView.isLargeTile()
-                    && nextFocusedTaskView == null)) {
+                    && nextFocusedTaskView == null && !dismissingForSplitSelection)) {
                 int offset = getOffsetToDismissedTask(scrollDiffPerPage, dismissedIndex, taskCount);
                 int scrollDiff = newScroll[i] - oldScroll[i] + offset;
                 if (scrollDiff != 0) {