am b0571826: Merge "Fix a bug in AbsListView nested scrolling support."

* commit 'b0571826d58f78a3355aa2a88352638e861f94c4':
  Fix a bug in AbsListView nested scrolling support.
This commit is contained in:
Adam Powell
2014-05-05 20:37:25 +00:00
committed by Android Git Automerger

View File

@@ -3380,7 +3380,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
mScrollOffset)) {
mMotionCorrection -= mScrollOffset[1];
lastYCorrection -= mScrollOffset[1];
vtev.offsetLocation(0, mScrollOffset[1]);
if (vtev != null) {
vtev.offsetLocation(0, mScrollOffset[1]);
}
} else {
overScrollBy(0, overscroll, 0, mScrollY, 0, 0,
0, mOverscrollDistance, true);