commit f4afdc41679523437729f2aaf0e8cbd69ccd706c
author Alex Chau <alexchau@google.com> Fri Jul 23 11:27:27 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 23 11:27:27 2021 +0000
tree 3c292e6158e52f3d666f4f9690b78d827ec337d4
parent c7c86dffe72e5d35e929b0ad33e2759fb47c0fc7
parent 41e77de54e8167da7d8a1b224e855ba0fb65e4c1

Merge "Avoid seeing ClearAllButton for overview grid's snap position" into sc-v2-dev

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 be6e3ff..6ea4a0d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3756,8 +3756,8 @@
             TaskView taskView = getTaskViewAt(i);
             float scrollDiff = taskView.getScrollAdjustment(showAsFullscreen, showAsGrid);
             int pageScroll = newPageScrolls[i + mTaskViewStartIndex] + (int) scrollDiff;
-            if ((mIsRtl && pageScroll < clearAllScroll)
-                    || (!mIsRtl && pageScroll > clearAllScroll)) {
+            if ((mIsRtl && pageScroll < clearAllScroll + clearAllWidth)
+                    || (!mIsRtl && pageScroll > clearAllScroll - clearAllWidth)) {
                 pageScroll = clearAllScroll + (mIsRtl ? clearAllWidth : -clearAllWidth);
             }
             if (outPageScrolls[i] != pageScroll) {