summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-03-02 18:04:43 -0800
committerAdam Powell <adamp@google.com>2010-03-02 18:04:43 -0800
commitd93b998c92ce192ea4b99cdf0cecd74df742fbef (patch)
tree194c512948743a06ec12510df307a2f7b7cddfbf /core/java/android
parentc018f3cfdd8a8277dbb3b61d4761974862876ab9 (diff)
Fix a bug in OverScroller.setFinalX/Y
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/widget/OverScroller.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java
index 1730a68ae31c..8469c8b6645f 100644
--- a/core/java/android/widget/OverScroller.java
+++ b/core/java/android/widget/OverScroller.java
@@ -418,6 +418,12 @@ public class OverScroller {
*/
public void setFinalX(int newX) {
if (mScrollMode == MODE_DEFAULT) {
+ if (newX < mMinimumX) {
+ mMinimumX = newX;
+ }
+ if (newX > mMaximumX) {
+ mMaximumX = newX;
+ }
mDefaultScroller.setFinalX(newX);
}
}
@@ -431,6 +437,12 @@ public class OverScroller {
*/
public void setFinalY(int newY) {
if (mScrollMode == MODE_DEFAULT) {
+ if (newY < mMinimumY) {
+ mMinimumY = newY;
+ }
+ if (newY > mMaximumY) {
+ mMaximumY = newY;
+ }
mDefaultScroller.setFinalY(newY);
}
}