summaryrefslogtreecommitdiff
path: root/core/java/android/widget/ScrollView.java
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-02-24 11:05:19 -0800
committerGilles Debunne <debunne@google.com>2010-03-19 12:23:09 -0700
commit52964243dc95f74ac2ab9a96d031a36931a11931 (patch)
tree0dbf5b0b135d63e97e1c101c6d4f881d8d7fed32 /core/java/android/widget/ScrollView.java
parent415b46c32ba17ce80bb133e9f0e24a8e08371dc4 (diff)
New OverScroller with edge bouncing effect.
OverScroller has been made a Scroller child class. Both use a physical constant deceleration force to compute the animation. OverScroller also includes a rubber edge bounce effect. Approved by Jim Palmer. Change-Id: I3f43a03694b8cb6bfa0784c2663b37c9c39322cc
Diffstat (limited to 'core/java/android/widget/ScrollView.java')
-rw-r--r--core/java/android/widget/ScrollView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java
index 68c0ff0c21ab..239c5f41fb46 100644
--- a/core/java/android/widget/ScrollView.java
+++ b/core/java/android/widget/ScrollView.java
@@ -1272,7 +1272,7 @@ public class ScrollView extends FrameLayout {
* Fling the scroll view
*
* @param velocityY The initial velocity in the Y direction. Positive
- * numbers mean that the finger/curor is moving down the screen,
+ * numbers mean that the finger/cursor is moving down the screen,
* which means we want to scroll towards the top.
*/
public void fling(int velocityY) {
@@ -1307,6 +1307,7 @@ public class ScrollView extends FrameLayout {
*
* <p>This version also clamps the scrolling to the bounds of our child.
*/
+ @Override
public void scrollTo(int x, int y) {
// we rely on the fact the View.scrollBy calls scrollTo.
if (getChildCount() > 0) {