Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Re-dispatch nested scrolls if not implemented" into nyc-dev

Browse Source 
am: 6b69b12

* commit '6b69b122025631290380f4350f7bd0074bad10dd':
  Re-dispatch nested scrolls if not implemented

Change-Id: Ibb88f89e0c77b2eef7dfda72c023fc19f27d77a0
This commit is contained in:
Chris Banes
2016-03-30 08:49:00 +00:00
committed by android-build-merger
parent 018c382277 6b69b12202
commit 75ff37ebed
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/ViewGroup.java
View File

@@ -6749,7 +6749,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
@Override
public void onNestedScroll(View target, int dxConsumed, int dyConsumed,
int dxUnconsumed, int dyUnconsumed) {
// Do nothing
// Re-dispatch up the tree by default
dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, null);
}
/**
@@ -6757,7 +6758,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
*/
@Override
public void onNestedPreScroll(View target, int dx, int dy, int[] consumed) {
// Do nothing
// Re-dispatch up the tree by default
dispatchNestedPreScroll(dx, dy, consumed, null);
}
/**
@@ -6765,7 +6767,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
*/
@Override
public boolean onNestedFling(View target, float velocityX, float velocityY, boolean consumed) {
return false;
// Re-dispatch up the tree by default
return dispatchNestedFling(velocityX, velocityY, consumed);
}
/**
@@ -6773,7 +6776,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
*/
@Override
public boolean onNestedPreFling(View target, float velocityX, float velocityY) {
return false;
// Re-dispatch up the tree by default
return dispatchNestedPreFling(velocityX, velocityY);
}
/**