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

am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early

Browse Source 
Merge commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d' into froyo-plus-aosp

* commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d':
  Fix bug 2639949 - Don't stop a Scroller early
This commit is contained in:
Adam Powell
2010-04-28 19:34:49 -07:00
committed by Android Git Automerger
parent 3b20c9e805 b40c42f1ff
commit 6483f6d546
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/widget/Scroller.java
View File

@@ -203,9 +203,6 @@ public class Scroller {
mCurrX = mStartX + Math.round(x * mDeltaX); mCurrX = mStartX + Math.round(x * mDeltaX);
mCurrY = mStartY + Math.round(x * mDeltaY); mCurrY = mStartY + Math.round(x * mDeltaY);
if ((mCurrX == mFinalX) && (mCurrY == mFinalY)) {
mFinished = true;
}
break; break;
case FLING_MODE: case FLING_MODE:
float timePassedSeconds = timePassed / 1000.0f; float timePassedSeconds = timePassed / 1000.0f;
@@ -222,10 +219,6 @@ public class Scroller {
mCurrY = Math.min(mCurrY, mMaxY); mCurrY = Math.min(mCurrY, mMaxY);
mCurrY = Math.max(mCurrY, mMinY); mCurrY = Math.max(mCurrY, mMinY);
if (mCurrX == mFinalX && mCurrY == mFinalY) {
mFinished = true;
}
break; break;
} }
} }