From a55191fe8f967cd74c5669447fb9b861c72bbd00 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Fri, 23 Jul 2010 15:49:03 -0700 Subject: [PATCH] DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller Change-Id: Ia176cdb029201dbad193d2d213d3cf6e16fbee63 --- core/java/android/widget/Scroller.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/java/android/widget/Scroller.java b/core/java/android/widget/Scroller.java index 784a75f22a7c..4cb0839036f2 100644 --- a/core/java/android/widget/Scroller.java +++ b/core/java/android/widget/Scroller.java @@ -218,7 +218,11 @@ public class Scroller { // Pin to mMinY <= mCurrY <= mMaxY mCurrY = Math.min(mCurrY, mMaxY); mCurrY = Math.max(mCurrY, mMinY); - + + if (mCurrX == mFinalX && mCurrY == mFinalY) { + mFinished = true; + } + break; } } -- 2.11.0