@@ -280,7 +280,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
280280 @ Override
281281 public boolean onInterceptTouchEvent (MotionEvent ev ) {
282282 ensureTarget ();
283- if (!isEnabled () || canChildScrollUp () || mRefreshing ) {
283+ if (!isEnabled () || canChildScrollUp () || mRefreshing || mNestedScrollInProgress ) {
284284 return false ;
285285 }
286286
@@ -343,7 +343,7 @@ private float getMotionEventY(MotionEvent ev, int activePointerId) {
343343
344344 @ Override
345345 public boolean onTouchEvent (MotionEvent ev ) {
346- if (!isEnabled () || canChildScrollUp ()) {
346+ if (!isEnabled () || canChildScrollUp () || mRefreshing || mNestedScrollInProgress ) {
347347 return false ;
348348 }
349349
@@ -567,7 +567,7 @@ public void onNestedScroll(@NonNull View target, int dxConsumed, int dyConsumed,
567567
568568 @ Override
569569 public boolean onStartNestedScroll (@ NonNull View child , @ NonNull View target , int axes , int type ) {
570- return (axes & ViewCompat .SCROLL_AXIS_VERTICAL ) != 0 ;
570+ return isEnabled () && ! mRefreshing && (axes & ViewCompat .SCROLL_AXIS_VERTICAL ) != 0 ;
571571 }
572572
573573 @ Override
@@ -596,7 +596,7 @@ public void onNestedScroll(@NonNull View target, int dxConsumed, int dyConsumed,
596596
597597 @ Override
598598 public void onNestedPreScroll (@ NonNull View target , int dx , int dy , @ NonNull int [] consumed , int type ) {
599- if (dy > 0 && mTotalUnconsumed > 0 ) {
599+ if (isEnabled () && dy > 0 && mTotalUnconsumed > 0 ) {
600600 if (dy > mTotalUnconsumed ) {
601601 consumed [1 ] = (int ) mTotalUnconsumed ;
602602 mTotalUnconsumed = 0 ;
@@ -705,7 +705,10 @@ public int getNestedScrollAxes() {
705705 }
706706
707707 private void onNestedScrollInternal (int dyUnconsumed , int type , @ Nullable int [] consumed ) {
708- if (dyUnconsumed < 0 && !canChildScrollUp ()) {
708+ if (!isEnabled () || mRefreshing || canChildScrollUp ()) {
709+ return ;
710+ }
711+ if (dyUnconsumed < 0 ) {
709712 mTotalUnconsumed += Math .abs (dyUnconsumed );
710713 moveSpinner (mTotalUnconsumed );
711714
0 commit comments