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

Commit bb8cc37e authored by Brian Attwell's avatar Brian Attwell Committed by Android (Google) Code Review
Browse files

Merge "Don't forget header momentum upon scroll events" into lmp-dev

parents f650cef9 7355a4e1

src/com/android/dialer/widget/OverlappingPaneLayout.java

+4 −2
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ public class OverlappingPaneLayout extends ViewGroup { 
        if (DEBUG) {

            Log.d(TAG, "onStopNestedScroll");

        }

        if (mIsInNestedScroll) {

        if (mIsInNestedScroll && !mIsInNestedFling) {

            mDragHelper.stopNestedScroll(mSlideableView);

            mInNestedPreScrollDownwards = false;

            mInNestedPreScrollUpwards = false;
@@ -1024,7 +1024,8 @@ public class OverlappingPaneLayout extends ViewGroup { 
                }

            }



            if (mDragHelper.getVelocityMagnitude() > 0

            if (state == ViewDragHelper.STATE_IDLE

                    && mDragHelper.getVelocityMagnitude() > 0

                    && (mDragHelper.getCurrentScrollY() == 0

                    || mDragHelper.getCurrentScrollY() == mIntermediateOffset)

                    && mIsInNestedFling) {
@@ -1099,6 +1100,7 @@ public class OverlappingPaneLayout extends ViewGroup { 
        public void onViewReleased(View releasedChild, float xvel, float yvel) {

            if (DEBUG) {

                Log.d(TAG, "onViewReleased: "

                        + " mIsInNestedFling=" + mIsInNestedFling

                        + " unscrolled=" + mPanelSlideCallbacks.isScrollableChildUnscrolled()

                        + ", mInNestedPreScrollDownwards = " + mInNestedPreScrollDownwards

                        + ", mInNestedPreScrollUpwards = " + mInNestedPreScrollUpwards