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

Commit ecb787f5 authored by Andy Wickham's avatar Andy Wickham Committed by Automerger Merge Worker
Browse files

Merge "Reset fast scroller when All Apps resets." into tm-qpr-dev am: 5969e052 am: 199eb1f5 

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



Change-Id: I62d3f2949704e68031894aeea77e395685ce6bd5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64c35110 199eb1f5

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java

+3 −0
Original line number Diff line number Diff line
@@ -360,6 +360,9 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
                mAH.get(i).mRecyclerView.scrollToTop();

            }

        }

        if (mTouchHandler != null) {

            mTouchHandler.endFastScrolling();

        }

        if (mHeader != null && mHeader.getVisibility() == VISIBLE) {

            mHeader.reset(animate);

        }

src/com/android/launcher3/views/RecyclerViewFastScroller.java

+14 −9
Original line number Diff line number Diff line
@@ -283,15 +283,7 @@ public class RecyclerViewFastScroller extends View { 
                break;

            case MotionEvent.ACTION_UP:

            case MotionEvent.ACTION_CANCEL:

                mRv.onFastScrollCompleted();

                mTouchOffsetY = 0;

                mLastTouchY = 0;

                mIgnoreDragGesture = false;

                if (mIsDragging) {

                    mIsDragging = false;

                    animatePopupVisibility(false);

                    showActiveScrollbar(false);

                }

                endFastScrolling();

                break;

        }

        if (DEBUG) {
@@ -330,6 +322,19 @@ public class RecyclerViewFastScroller extends View { 
        setThumbOffsetY((int) mLastTouchY);

    }



    /** End any active fast scrolling touch handling, if applicable. */

    public void endFastScrolling() {

        mRv.onFastScrollCompleted();

        mTouchOffsetY = 0;

        mLastTouchY = 0;

        mIgnoreDragGesture = false;

        if (mIsDragging) {

            mIsDragging = false;

            animatePopupVisibility(false);

            showActiveScrollbar(false);

        }

    }



    public void onDraw(Canvas canvas) {

        if (mThumbOffsetY < 0) {

            return;