diff options
| author | Adam Powell <adamp@google.com> | 2010-09-01 17:47:16 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-09-02 00:14:53 -0700 |
| commit | 5916882c3f13429d29f95b89dd94bd2d5733da85 (patch) | |
| tree | a723bca215f9b167d81420c0a90eeed912d0a5ee /core/java/android/widget/ScrollView.java | |
| parent | a2511da9d65b11be7f59ed3f525f77e85aeb4bef (diff) | |
DO NOT MERGE Overscroll continues; asset and behavior tweaks.
Change-Id: I367643877a397e7b4fa9bd8c40639ff69436e7f0
Diffstat (limited to 'core/java/android/widget/ScrollView.java')
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 9d971f6b213f..7b5e4125eca8 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -1374,7 +1374,7 @@ public class ScrollView extends FrameLayout { if (mode != OVERSCROLL_NEVER) { if (mEdgeGlowTop == null) { final Resources res = getContext().getResources(); - final Drawable edge = res.getDrawable(R.drawable.edge_light); + final Drawable edge = res.getDrawable(R.drawable.overscroll_edge); final Drawable glow = res.getDrawable(R.drawable.overscroll_glow); mEdgeGlowTop = new EdgeGlow(edge, glow); mEdgeGlowBottom = new EdgeGlow(edge, glow); @@ -1395,7 +1395,7 @@ public class ScrollView extends FrameLayout { final int restoreCount = canvas.save(); final int width = getWidth(); - canvas.translate(-width / 2, scrollY); + canvas.translate(-width / 2, Math.min(0, scrollY)); mEdgeGlowTop.setSize(width * 2, getHeight()); if (mEdgeGlowTop.draw(canvas)) { invalidate(); @@ -1407,7 +1407,7 @@ public class ScrollView extends FrameLayout { final int width = getWidth(); final int height = getHeight(); - canvas.translate(-width / 2, scrollY + height); + canvas.translate(-width / 2, Math.max(getScrollRange(), scrollY) + height); canvas.rotate(180, width, 0); mEdgeGlowBottom.setSize(width * 2, height); if (mEdgeGlowBottom.draw(canvas)) { |