diff options
author | Katie McCormick <kmccormick@google.com> | 2013-02-07 15:59:35 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-07 15:59:35 -0800 |
commit | aff494005b9faa40969c176d4e9bd79cad105a4e (patch) | |
tree | 54dab498ccdf754f08afcc1feec05ed3b7c0705f | |
parent | b4c1dc1c1580d0970631cc291b4b4c6e9dc96af3 (diff) | |
parent | 1309c9e2afe79ccd73cbf76f52477ffba92d10bd (diff) | |
download | frameworks_base-aff494005b9faa40969c176d4e9bd79cad105a4e.zip frameworks_base-aff494005b9faa40969c176d4e9bd79cad105a4e.tar.gz frameworks_base-aff494005b9faa40969c176d4e9bd79cad105a4e.tar.bz2 |
am 1309c9e2: am 93ebe284: am 80a01a7f: am ef4196d0: am 89fafaea: Doc update: clean up
# Via Android Git Automerger (4) and Katie McCormick (1)
* commit '1309c9e2afe79ccd73cbf76f52477ffba92d10bd':
Doc update: clean up
-rw-r--r-- | docs/html/training/gestures/scroll.jd | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/docs/html/training/gestures/scroll.jd b/docs/html/training/gestures/scroll.jd index 955495a..8576948 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—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> |