summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatie McCormick <kmccormick@google.com>2013-02-07 15:49:36 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-07 15:49:36 -0800
commitef4196d0ec0a5e89c51b3cc455f083af2fbf3b98 (patch)
treededcd7b26ba34aed46f25beae0d5847a57410084
parent805d2e2d98fa8749d6ae38650c77c79611174944 (diff)
parent89fafaeae73cc265f13775944ccb2841bbc6766c (diff)
downloadbase-ef4196d0ec0a5e89c51b3cc455f083af2fbf3b98.tar.gz
am 89fafaea: Doc update: clean up
# Via Katie McCormick * commit '89fafaeae73cc265f13775944ccb2841bbc6766c': Doc update: clean up
-rw-r--r--docs/html/training/gestures/scroll.jd11
1 files changed, 2 insertions, 9 deletions
diff --git a/docs/html/training/gestures/scroll.jd b/docs/html/training/gestures/scroll.jd
index 955495a367b1..8576948b5a23 100644
--- a/docs/html/training/gestures/scroll.jd
+++ b/docs/html/training/gestures/scroll.jd
@@ -45,13 +45,7 @@ a scrolling effect in response to touch gestures using <em>scrollers</em>.
<p>You can use scrollers ({@link android.widget.Scroller} or {@link
android.widget.OverScroller}) to collect the data you need to produce a
-scrolling animation in response to a touch event. {@link
-android.widget.Scroller} and {@link android.widget.OverScroller} are largely
-interchangeable&mdash;the difference is that {@link android.widget.OverScroller}
-allows temporarily scrolling beyond the minimum/maximum boundaries and springing
-back to the bounds. This is normally rendered using a "glow" effect, provided by
-the {@link android.widget.EdgeEffect} or {@link
-android.support.v4.widget.EdgeEffectCompat} classes. </p>
+scrolling animation in response to a touch event.</p>
<p>A scroller is used to animate scrolling over time, using platform-standard
scrolling physics (friction, velocity, etc.). The scroller itself doesn't
@@ -157,5 +151,4 @@ public void computeScroll() {
}</pre>
<p>For another example of scroller usage, see the <a href="http://github.com/android/platform_frameworks_support/blob/master/v4/java/android/support/v4/view/ViewPager.java">source code</a> for the
-{@link android.support.v4.view.ViewPager} class. It scrolls in response to flings,
-and uses scrolling to implement the "snapping to page" animation.</p>
+{@link android.support.v4.view.ViewPager} class.</p>