Remove use of deprecated ViewCompat.canScrollVertically
Test: None
Change-Id: I6100e8533c54dfdba0d49120ee31f27d368a7c94
diff --git a/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java b/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java
index 983683f..8432658 100644
--- a/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java
+++ b/core-ui/java/android/support/v4/widget/SwipeRefreshLayout.java
@@ -661,7 +661,7 @@
if (mTarget instanceof ListView) {
return ListViewCompat.canScrollList((ListView) mTarget, -1);
}
- return ViewCompat.canScrollVertically(mTarget, -1);
+ return mTarget.canScrollVertically(-1);
}
/**
diff --git a/design/src/android/support/design/widget/AppBarLayout.java b/design/src/android/support/design/widget/AppBarLayout.java
index 89fcf7c..afdfafb 100644
--- a/design/src/android/support/design/widget/AppBarLayout.java
+++ b/design/src/android/support/design/widget/AppBarLayout.java
@@ -1085,7 +1085,7 @@
// If we have a reference to a scrolling view, check it
final View scrollingView = mLastNestedScrollingChildRef.get();
return scrollingView != null && scrollingView.isShown()
- && !ViewCompat.canScrollVertically(scrollingView, -1);
+ && !scrollingView.canScrollVertically(-1);
} else {
// Otherwise we assume that the scrolling view hasn't been scrolled and can drag.
return true;
diff --git a/design/src/android/support/design/widget/BottomSheetBehavior.java b/design/src/android/support/design/widget/BottomSheetBehavior.java
index 6868d29..a28d3be 100644
--- a/design/src/android/support/design/widget/BottomSheetBehavior.java
+++ b/design/src/android/support/design/widget/BottomSheetBehavior.java
@@ -359,7 +359,7 @@
setStateInternal(STATE_DRAGGING);
}
} else if (dy < 0) { // Downward
- if (!ViewCompat.canScrollVertically(target, -1)) {
+ if (!target.canScrollVertically(-1)) {
if (newTop <= mMaxOffset || mHideable) {
consumed[1] = dy;
ViewCompat.offsetTopAndBottom(child, -dy);
@@ -648,7 +648,7 @@
}
if (mState == STATE_EXPANDED && mActivePointerId == pointerId) {
View scroll = mNestedScrollingChildRef.get();
- if (scroll != null && ViewCompat.canScrollVertically(scroll, -1)) {
+ if (scroll != null && scroll.canScrollVertically(-1)) {
// Let the content scroll up
return false;
}
diff --git a/v7/appcompat/src/android/support/v7/app/AlertController.java b/v7/appcompat/src/android/support/v7/app/AlertController.java
index d0f8fd6..986baf3 100644
--- a/v7/appcompat/src/android/support/v7/app/AlertController.java
+++ b/v7/appcompat/src/android/support/v7/app/AlertController.java
@@ -738,11 +738,11 @@
static void manageScrollIndicators(View v, View upIndicator, View downIndicator) {
if (upIndicator != null) {
upIndicator.setVisibility(
- ViewCompat.canScrollVertically(v, -1) ? View.VISIBLE : View.INVISIBLE);
+ v.canScrollVertically(-1) ? View.VISIBLE : View.INVISIBLE);
}
if (downIndicator != null) {
downIndicator.setVisibility(
- ViewCompat.canScrollVertically(v, 1) ? View.VISIBLE : View.INVISIBLE);
+ v.canScrollVertically(1) ? View.VISIBLE : View.INVISIBLE);
}
}