Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50f66511 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias
Browse files

Fix IllegalStateException caused by trying to snap to destination before initalizing page scrolls. 

Bug: 262256539
Test: swiped home several times
Change-Id: I1d4b515f917e89c2ee0112a408499734222c6852
parent 50b82f88

src/com/android/launcher3/PagedView.java

+7 −5
Original line number Diff line number Diff line
@@ -1404,15 +1404,17 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
                            (isFling && !isVelocityLeft)) && mCurrentPage > 0) {

                        finalPage = returnToOriginalPage

                                ? mCurrentPage : mCurrentPage - getPanelCount();

                        snapToPageWithVelocity(finalPage, velocity);

                        runOnPageScrollsInitialized(

                                () -> snapToPageWithVelocity(finalPage, velocity));

                    } else if (((isSignificantMove && isDeltaLeft && !isFling) ||

                            (isFling && isVelocityLeft)) &&

                            mCurrentPage < getChildCount() - 1) {

                        finalPage = returnToOriginalPage

                                ? mCurrentPage : mCurrentPage + getPanelCount();

                        snapToPageWithVelocity(finalPage, velocity);

                        runOnPageScrollsInitialized(

                                () -> snapToPageWithVelocity(finalPage, velocity));

                    } else {

                        snapToDestination();

                        runOnPageScrollsInitialized(this::snapToDestination);

                    }

                } else {

                    if (!mScroller.isFinished()) {
@@ -1435,7 +1437,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 


                        int finalPos = mScroller.getFinalX();

                        mNextPage = getDestinationPage(finalPos);

                        onNotSnappingToPageInFreeScroll();

                        runOnPageScrollsInitialized(this::onNotSnappingToPageInFreeScroll);

                    }

                    invalidate();

                }
@@ -1449,7 +1451,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 


        case MotionEvent.ACTION_CANCEL:

            if (mIsBeingDragged) {

                snapToDestination();

                runOnPageScrollsInitialized(this::snapToDestination);

            }

            mEdgeGlowLeft.onRelease();

            mEdgeGlowRight.onRelease();