drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Can't stop the fling! Bug: 5335420" into ics-factoryrom

Browse Source
This commit is contained in:
Jeff Brown
2011-09-16 23:29:15 -07:00
committed by Android (Google) Code Review
parent 259db3f66f b0c71eb9f5
commit 79aa40302b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/AbsListView.java
View File

@ -3654,7 +3654,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
vt.computeCurrentVelocity(1000, mMaximumVelocity);
final float yvel = -vt.getYVelocity(activeId);
if (scroller.isScrollingInDirection(0, yvel)) {
if (Math.abs(yvel) >= mMinimumVelocity
&& scroller.isScrollingInDirection(0, yvel)) {
// Keep the fling alive a little longer
postDelayed(this, FLYWHEEL_TIMEOUT);
} else {

2
core/java/android/widget/OverScroller.java
View File

@ -532,7 +532,7 @@ public class OverScroller {
final int dx = mScrollerX.mFinal - mScrollerX.mStart;
final int dy = mScrollerY.mFinal - mScrollerY.mStart;
return !isFinished() && Math.signum(xvel) == Math.signum(dx) &&
Math.signum(yvel) == Math.signum(dy);
Math.signum(yvel) == Math.signum(dy);
}
static class SplineOverScroller {

2
libs/ui/Input.cpp
View File

@ -1020,6 +1020,8 @@ bool VelocityTracker::getVelocity(uint32_t id, float* outVx, float* outVy) const
return true;
}
}
*outVx = 0;
*outVy = 0;
return false;
}