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
This commit is contained in:
Alex Chau
2021-07-23 11:44:39 +00:00
committed by Automerger Merge Worker
@@ -3756,8 +3756,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
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) {