commit 58f1b7f77e73326cd7cfaf1e0749f69e788ecf7b
author Alex Chau <alexchau@google.com> Fri Dec 10 18:24:47 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 10 18:24:47 2021 +0000
tree 289e5ed1e3b05ea5223134c10dd396328ac975a1
parent 1ced59acb4bd9724f19d6d8e9dbb2bff1ae8c415
parent abc325df918f66717c3f75acf8cbf05271768ed3

Don't snap to focused task in split select am: 9ef8e2dcee am: abc325df91

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

Change-Id: I6ddd47521b21868e7c70d724aedcb42f791d9b32

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 3117450..c5b191e 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1279,6 +1279,9 @@
                             : getScrollForPage(mNextPage);
 
             if (showAsGrid()) {
+                if (isSplitSelectionActive()) {
+                    return;
+                }
                 TaskView taskView = getTaskViewAt(mNextPage);
                 // Only snap to fully visible focused task.
                 if (taskView == null