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

Commit 1af550fa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-4864e8c3-e581-4e7f-bc1f-7276c1bf7352' into ub-launcher3-dorval-polish2 

* changes:
  [automerger] Fix bug where user gets stuck in overscroll. am: 27ad267a
  Fix bug where user gets stuck in overscroll.
parents d48710c2 572da280

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

+14 −10
Original line number Diff line number Diff line
@@ -110,12 +110,6 @@ public class AllAppsRecyclerView extends BaseRecyclerView implements LogContaine 
        }

    }



    @Override

    public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent ev) {

        mPullDetector.onTouchEvent(ev);

        return super.onInterceptTouchEvent(rv, ev) || mOverScrollHelper.isInOverScroll();

    }



    @Override

    public boolean onTouchEvent(MotionEvent e) {

        mPullDetector.onTouchEvent(e);
@@ -287,7 +281,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView implements LogContaine 


    @Override

    public boolean onInterceptTouchEvent(MotionEvent e) {

        boolean result = super.onInterceptTouchEvent(e);

        mPullDetector.onTouchEvent(e);

        boolean result = super.onInterceptTouchEvent(e) || mOverScrollHelper.isInOverScroll();

        if (!result && e.getAction() == MotionEvent.ACTION_DOWN

                && mEmptySearchBackground != null && mEmptySearchBackground.getAlpha() > 0) {

            mEmptySearchBackground.setHotspot(e.getX(), e.getY());
@@ -562,11 +557,16 @@ public class AllAppsRecyclerView extends BaseRecyclerView implements LogContaine 
            // and if one of the following criteria are met:

            // - User scrolls down when they're already at the bottom.

            // - User starts scrolling up, hits the top, and continues scrolling up.

            boolean wasInOverScroll = mIsInOverScroll;

            mIsInOverScroll = !mScrollbar.isDraggingThumb() &&

                    ((!canScrollVertically(1) && displacement < 0) ||

                    (!canScrollVertically(-1) && isScrollingUp && mFirstScrollYOnScrollUp != 0));



            if (mIsInOverScroll) {

            if (wasInOverScroll && !mIsInOverScroll) {

                // Exit overscroll. This can happen when the user is in overscroll and then

                // scrolls the opposite way.

                reset(false /* shouldSpring */);

            } else if (mIsInOverScroll) {

                if (Float.compare(mFirstDisplacement, 0) == 0) {

                    // Because users can scroll before entering overscroll, we need to

                    // subtract the amount where the user was not in overscroll.
@@ -581,11 +581,15 @@ public class AllAppsRecyclerView extends BaseRecyclerView implements LogContaine 


        @Override

        public void onDragEnd(float velocity, boolean fling) {

           reset(mIsInOverScroll  /* shouldSpring */);

        }



        private void reset(boolean shouldSpring) {

            float y = getContentTranslationY();

            if (Float.compare(y, 0) != 0) {

                if (FeatureFlags.LAUNCHER3_PHYSICS) {

                if (FeatureFlags.LAUNCHER3_PHYSICS && shouldSpring) {

                    // We calculate our own velocity to give the springs the desired effect.

                    velocity = y / getDampedOverScroll(getHeight()) * MAX_RELEASE_VELOCITY;

                    float velocity = y / getDampedOverScroll(getHeight()) * MAX_RELEASE_VELOCITY;

                    // We want to negate the velocity because we are moving to 0 from -1 due to the

                    // downward motion. (y-axis -1 is above 0).

                    mSpringAnimationHandler.animateToPositionWithVelocity(0, -1, -velocity);