diff options
| author | Chris Banes <chrisbanes@google.com> | 2015-11-13 15:01:22 +0000 |
|---|---|---|
| committer | Chris Banes <chrisbanes@google.com> | 2015-11-13 15:01:22 +0000 |
| commit | e1b81bbd6621232fa7ebcaf993bfe3aa7d472fbb (patch) | |
| tree | 3b4b9e4ec4b629c1e24aadef89efc19b76bfc03f /v4/java/android | |
| parent | c01d6ec6e410ab0460164004ba5549ca76578f4c (diff) | |
| download | android_frameworks_support-e1b81bbd6621232fa7ebcaf993bfe3aa7d472fbb.tar.gz android_frameworks_support-e1b81bbd6621232fa7ebcaf993bfe3aa7d472fbb.tar.bz2 android_frameworks_support-e1b81bbd6621232fa7ebcaf993bfe3aa7d472fbb.zip | |
Make sure we honor canChildScrollUp()
In the new nested scrolling flow we weren't
checking the callback. This CL adds it.
BUG: 25680804
Change-Id: I23cee7dde06b239195d02cd7ae7ab443b8769c36
Diffstat (limited to 'v4/java/android')
| -rw-r--r-- | v4/java/android/support/v4/widget/SwipeRefreshLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/v4/java/android/support/v4/widget/SwipeRefreshLayout.java b/v4/java/android/support/v4/widget/SwipeRefreshLayout.java index e1386abc24..18b762cfd2 100644 --- a/v4/java/android/support/v4/widget/SwipeRefreshLayout.java +++ b/v4/java/android/support/v4/widget/SwipeRefreshLayout.java @@ -732,7 +732,7 @@ public class SwipeRefreshLayout extends ViewGroup implements NestedScrollingPare @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; } |