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

am 01acdd9f: am 8228e424: Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev

Browse Source 
* commit '01acdd9feaa1dfe32863b667dd9300240bbc3db7':
  Fix huge bounce-back in ListView when double-flinging
This commit is contained in:
Vladislav Kaznacheev
2015-06-22 09:46:30 +00:00
committed by Android Git Automerger
parent 14db106412 01acdd9fea
commit 86578bee88
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/widget/OverScroller.java
View File

@@ -731,7 +731,7 @@ public class OverScroller {
// mStartTime has been set
mFinished = false;
mState = CUBIC;
mStart = start;
mCurrentPosition = mStart = start;
mFinal = end;
final int delta = start - end;
mDeceleration = getDeceleration(delta);
@@ -797,7 +797,9 @@ public class OverScroller {
private void fitOnBounceCurve(int start, int end, int velocity) {
// Simulate a bounce that started from edge
final float durationToApex = - velocity / mDeceleration;
final float distanceToApex = velocity * velocity / 2.0f / Math.abs(mDeceleration);
// The float cast below is necessary to avoid integer overflow.
final float velocitySquared = (float) velocity * velocity;
final float distanceToApex = velocitySquared / 2.0f / Math.abs(mDeceleration);
final float distanceToEdge = Math.abs(end - start);
final float totalDuration = (float) Math.sqrt(
2.0 * (distanceToApex + distanceToEdge) / Math.abs(mDeceleration));
@@ -848,12 +850,14 @@ public class OverScroller {
private void onEdgeReached() {
// mStart, mVelocity and mStartTime were adjusted to their values when edge was reached.
float distance = mVelocity * mVelocity / (2.0f * Math.abs(mDeceleration));
// The float cast below is necessary to avoid integer overflow.
final float velocitySquared = (float) mVelocity * mVelocity;
float distance = velocitySquared / (2.0f * Math.abs(mDeceleration));
final float sign = Math.signum(mVelocity);
if (distance > mOver) {
// Default deceleration is not sufficient to slow us down before boundary
mDeceleration = - sign * mVelocity * mVelocity / (2.0f * mOver);
mDeceleration = - sign * velocitySquared / (2.0f * mOver);
distance = mOver;
}