Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6483f6d5 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

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

Merge commit 'b40c42f1' into froyo-plus-aosp

* commit 'b40c42f1':
  Fix bug 2639949 - Don't stop a Scroller early
parents 3b20c9e8 b40c42f1

core/java/android/widget/Scroller.java

+0 −7
Original line number Diff line number Diff line
@@ -203,9 +203,6 @@ public class Scroller { 
    

                mCurrX = mStartX + Math.round(x * mDeltaX);

                mCurrY = mStartY + Math.round(x * mDeltaY);

                if ((mCurrX == mFinalX) && (mCurrY == mFinalY)) {

                    mFinished = true;

                }

                break;

            case FLING_MODE:

                float timePassedSeconds = timePassed / 1000.0f;
@@ -222,10 +219,6 @@ public class Scroller { 
                mCurrY = Math.min(mCurrY, mMaxY);

                mCurrY = Math.max(mCurrY, mMinY);

                

                if (mCurrX == mFinalX && mCurrY == mFinalY) {

                    mFinished = true;

                }

                

                break;

            }

        }