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