| commit | aa0d69972281de0d91614b994156f05cf80a0e95 | [log] [tgz] |
|---|---|---|
| author | Alex Chau <alexchau@google.com> | Fri Jul 23 11:44:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 23 11:44:39 2021 +0000 |
| tree | 2bff81348259e93ab596b12aa55aed692ef73c0a | |
| parent | 466e336f733c97fbc2712de6a3b54798ff082d97 [diff] | |
| parent | f4afdc41679523437729f2aaf0e8cbd69ccd706c [diff] |
Merge "Avoid seeing ClearAllButton for overview grid's snap position" into sc-v2-dev am: f4afdc4167 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15359119 Change-Id: I70244fbf58f22e8aa85a29b606a9b397b92304db
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) {