diff options
| author | Adam Powell <adamp@google.com> | 2011-08-31 14:26:12 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-08-31 14:59:19 -0700 |
| commit | 89935e41c593a599e8955388b27fb926e60e5e94 (patch) | |
| tree | efd003906efae3b1dccf17a939a9d96f28d79304 /core/java/android/widget/ScrollView.java | |
| parent | ac73e4bb420dbda31a866f3b86b207c71ecfa2f6 (diff) | |
Make EdgeEffect public API.
This enables apps to make use of the system's visual edge effect used
during overscroll in 2D content.
Also un-@hide the getCurrVelocity methods from Scroller/OverScroller,
without which it becomes cumbersome to obtain values to pass to the
EdgeEffect#onAbsorb method.
Change-Id: I40e452455f5cb5d45d1fb3687f739fc8eae65560
Diffstat (limited to 'core/java/android/widget/ScrollView.java')
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 09c875bd337e..6a6bc236a84a 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -69,8 +69,8 @@ public class ScrollView extends FrameLayout { private final Rect mTempRect = new Rect(); private OverScroller mScroller; - private EdgeGlow mEdgeGlowTop; - private EdgeGlow mEdgeGlowBottom; + private EdgeEffect mEdgeGlowTop; + private EdgeEffect mEdgeGlowBottom; /** * Position of the last motion event. @@ -1511,11 +1511,8 @@ public class ScrollView extends FrameLayout { if (mode != OVER_SCROLL_NEVER) { if (mEdgeGlowTop == null) { Context context = getContext(); - final Resources res = context.getResources(); - final Drawable edge = res.getDrawable(R.drawable.overscroll_edge); - final Drawable glow = res.getDrawable(R.drawable.overscroll_glow); - mEdgeGlowTop = new EdgeGlow(context, edge, glow); - mEdgeGlowBottom = new EdgeGlow(context, edge, glow); + mEdgeGlowTop = new EdgeEffect(context); + mEdgeGlowBottom = new EdgeEffect(context); } } else { mEdgeGlowTop = null; |
