Merge "Don't let RecyclerView consume fling action when there is no further space." (615c9ee4) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/RecyclerView.java

+16 −2

Original line number	Diff line number	Diff line
		@@ -2011,13 +2011,27 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
		}

		if (!dispatchNestedPreFling(velocityX, velocityY)) {
		final boolean canScroll = canScrollHorizontal \|\| canScrollVertical;
		dispatchNestedFling(velocityX, velocityY, canScroll);
		final View firstChild = mLayout.getChildAt(0);
		final View lastChild = mLayout.getChildAt(mLayout.getChildCount() - 1);
		boolean consumed = false;
		if (velocityY < 0) {
		consumed = getChildAdapterPosition(firstChild) > 0
		\|\| firstChild.getTop() < getPaddingTop();
		}

		if (velocityY > 0) {
		consumed = getChildAdapterPosition(lastChild) < mAdapter.getItemCount() - 1
		\|\| lastChild.getBottom() > getHeight() - getPaddingBottom();
		}

		dispatchNestedFling(velocityX, velocityY, consumed);

		if (mOnFlingListener != null && mOnFlingListener.onFling(velocityX, velocityY)) {
		return true;
		}

		final boolean canScroll = canScrollHorizontal \|\| canScrollVertical;

		if (canScroll) {
		velocityX = Math.max(-mMaxFlingVelocity, Math.min(velocityX, mMaxFlingVelocity));
		velocityY = Math.max(-mMaxFlingVelocity, Math.min(velocityY, mMaxFlingVelocity));