Allow snapping to focused task in overview grid am: b6ad9dfaf5

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

Change-Id: I811324cbfa99c9ebf8ba070e6d6d03f6aa467732
This commit is contained in:
Alex Chau
2021-12-10 15:13:44 +00:00
committed by Automerger Merge Worker

View File

@@ -1264,7 +1264,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
@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 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
? 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