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

Commit 99523bf7 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Automerger Merge Worker
Browse files

Merge "Fix fast scroller issues / remove fast thumb access / fix wrong popup... 

Merge "Fix fast scroller issues / remove fast thumb access / fix wrong popup location" into sc-dev am: 56c33c3c am: 46255ad6

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

Change-Id: I7c495406a731dae0e18cdb1a2b5e3aad6379dc9d
parents e1fd19bf 46255ad6

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

+1 −9
Original line number Diff line number Diff line
@@ -278,12 +278,7 @@ public class RecyclerViewFastScroller extends View { 
                mIgnoreDragGesture |= absDeltaY > mConfig.getScaledPagingTouchSlop();



                if (!mIsDragging && !mIgnoreDragGesture && mRv.supportsFastScrolling()) {

                    // condition #1: triggering thumb is distance, angle based

                    if ((isNearThumb(mDownX, mLastY)

                            && absDeltaY > mConfig.getScaledPagingTouchSlop()

                            && absDeltaY > absDeltaX)

                            // condition#2: Fastscroll function is now time based

                            || (isNearScrollBar(mDownX) && ev.getEventTime() - mDownTimeStampMillis

                    if ((isNearThumb(mDownX, mLastY) && ev.getEventTime() - mDownTimeStampMillis

                                    > FASTSCROLL_THRESHOLD_MILLIS)) {

                        calcTouchOffsetAndPrepToFastScroll(mDownY, mLastY);

                    }
@@ -433,9 +428,6 @@ public class RecyclerViewFastScroller extends View { 
    }



    private void updatePopupY(int lastTouchY) {

        if (!mPopupVisible) {

            return;

        }

        int height = mPopupView.getHeight();

        // Aligns the rounded corner of the pop up with the top of the thumb.

        float top = mRv.getScrollBarTop() + lastTouchY + (getScrollThumbRadius() / 2f)