diff options
| author | Mindy Pereira <mindyp@google.com> | 2010-09-26 18:16:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-26 18:16:26 -0700 |
| commit | 08c09b0f84b23627b4cd02e1b9a642952fbd2e7f (patch) | |
| tree | 0e94abc998b292e7500f254eaf2c9b102e30bf71 | |
| parent | 9035e206b3700928bc268b7c1ece34506e0a4f28 (diff) | |
| parent | 7d4995d250a771b9705286e28fa4be7afbd44722 (diff) | |
| download | frameworks_base-08c09b0f84b23627b4cd02e1b9a642952fbd2e7f.zip frameworks_base-08c09b0f84b23627b4cd02e1b9a642952fbd2e7f.tar.gz frameworks_base-08c09b0f84b23627b4cd02e1b9a642952fbd2e7f.tar.bz2 | |
Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
| -rw-r--r-- | core/java/android/webkit/WebView.java | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 7490a7a..7098bf3 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2950,16 +2950,28 @@ public class WebView extends AbsoluteLayout if (rangeY > 0 || getOverscrollMode() == OVERSCROLL_ALWAYS) { if (y < 0 && oldY >= 0) { mEdgeGlowTop.onAbsorb((int) mScroller.getCurrVelocity()); + if (!mEdgeGlowBottom.isFinished()) { + mEdgeGlowBottom.onRelease(); + } } else if (y > rangeY && oldY <= rangeY) { mEdgeGlowBottom.onAbsorb((int) mScroller.getCurrVelocity()); + if (!mEdgeGlowTop.isFinished()) { + mEdgeGlowTop.onRelease(); + } } } if (rangeX > 0) { if (x < 0 && oldX >= 0) { mEdgeGlowLeft.onAbsorb((int) mScroller.getCurrVelocity()); + if (!mEdgeGlowRight.isFinished()) { + mEdgeGlowRight.onRelease(); + } } else if (x > rangeX && oldX <= rangeX) { mEdgeGlowRight.onAbsorb((int) mScroller.getCurrVelocity()); + if (!mEdgeGlowLeft.isFinished()) { + mEdgeGlowLeft.onRelease(); + } } } } @@ -5548,8 +5560,14 @@ public class WebView extends AbsoluteLayout final int pulledToX = oldX + deltaX; if (pulledToX < 0) { mEdgeGlowLeft.onPull((float) deltaX / getWidth()); + if (!mEdgeGlowRight.isFinished()) { + mEdgeGlowRight.onRelease(); + } } else if (pulledToX > rangeX) { mEdgeGlowRight.onPull((float) deltaX / getWidth()); + if (!mEdgeGlowLeft.isFinished()) { + mEdgeGlowLeft.onRelease(); + } } } @@ -5557,8 +5575,14 @@ public class WebView extends AbsoluteLayout final int pulledToY = oldY + deltaY; if (pulledToY < 0) { mEdgeGlowTop.onPull((float) deltaY / getHeight()); + if (!mEdgeGlowBottom.isFinished()) { + mEdgeGlowBottom.onRelease(); + } } else if (pulledToY > rangeY) { mEdgeGlowBottom.onPull((float) deltaY / getHeight()); + if (!mEdgeGlowTop.isFinished()) { + mEdgeGlowTop.onRelease(); + } } } } |