commit b58b0d5a7ef0ef82db1840b4235fabe75d4832a4
author Chris Banes <chrisbanes@google.com> Mon Nov 16 09:07:53 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 16 09:07:53 2015 +0000
tree 6062ed93aad97425b7ca48e03f15c141cbb564d7
parent 11f682c4574b53ba6113bb811f197eadde491eb7
parent e1b81bbd6621232fa7ebcaf993bfe3aa7d472fbb

Merge "Make sure we honor canChildScrollUp()" into mnc-ub-dev

v4/java/android/support/v4/widget/SwipeRefreshLayout.java

diff --git a/v4/java/android/support/v4/widget/SwipeRefreshLayout.java b/v4/java/android/support/v4/widget/SwipeRefreshLayout.java
index e1386ab..18b762c 100644
--- a/v4/java/android/support/v4/widget/SwipeRefreshLayout.java
+++ b/v4/java/android/support/v4/widget/SwipeRefreshLayout.java
@@ -732,7 +732,7 @@
 
     @Override
     public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) {
-        return isEnabled() && !mReturningToStart && !mRefreshing
+        return isEnabled() && canChildScrollUp() && !mReturningToStart && !mRefreshing
                 && (nestedScrollAxes & ViewCompat.SCROLL_AXIS_VERTICAL) != 0;
     }