commit 1ced59acb4bd9724f19d6d8e9dbb2bff1ae8c415
author Alex Chau <alexchau@google.com> Fri Dec 10 15:28:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 10 15:28:44 2021 +0000
tree b0d196c2af5df1c2605a56ed3b426a65928643d9
parent d35c6f97fe266a3aefaffb84342de355b5a43967
parent 17a0eec015beb1763074f18808c44a2daf9f7224

Allow snapping to focused task in overview grid am: b6ad9dfaf5 am: 17a0eec015

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

Change-Id: Id925b44f6a324e821150efe1b3e1cc001497c69e

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 d855d5b..3117450 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1264,7 +1264,7 @@
     @Override
     protected void onNotSnappingToPageInFreeScroll() {
         int finalPos = mScroller.getFinalX();
-        if (!showAsGrid() && finalPos > mMinScroll && finalPos < mMaxScroll) {
+        if (finalPos > mMinScroll && finalPos < mMaxScroll) {
             int firstPageScroll = getScrollForPage(!mIsRtl ? 0 : getPageCount() - 1);
             int lastPageScroll = getScrollForPage(!mIsRtl ? getPageCount() - 1 : 0);
 
@@ -1278,6 +1278,16 @@
                             ? mMaxScroll
                             : getScrollForPage(mNextPage);
 
+            if (showAsGrid()) {
+                TaskView taskView = getTaskViewAt(mNextPage);
+                // Only snap to fully visible focused task.
+                if (taskView == null
+                        || !taskView.isFocusedTask()
+                        || !isTaskViewFullyVisible(taskView)) {
+                    return;
+                }
+            }
+
             mScroller.setFinalX(pageSnapped);
             // Ensure the scroll/snap doesn't happen too fast;
             int extraScrollDuration = OVERSCROLL_PAGE_SNAP_ANIMATION_DURATION