diff options
| author | Jonathan Dixon <joth@google.com> | 2012-02-28 18:45:06 +0000 |
|---|---|---|
| committer | Jonathan Dixon <joth@google.com> | 2012-03-02 11:17:47 +0000 |
| commit | 3c90952036a5ff7ddb2946c643f1a0bf1c31d53a (patch) | |
| tree | 974ef2a94c60a2c72b8fbd804613792480a9c3e5 /core/java/android/webkit/OverScrollGlow.java | |
| parent | 0dc0da67d9775b2364a38d015e0610492708a02e (diff) | |
| download | frameworks_base-3c90952036a5ff7ddb2946c643f1a0bf1c31d53a.zip frameworks_base-3c90952036a5ff7ddb2946c643f1a0bf1c31d53a.tar.gz frameworks_base-3c90952036a5ff7ddb2946c643f1a0bf1c31d53a.tar.bz2 | |
Refactor WebView to be a thin proxy class
Splits interface and implementation; all client calls are forwarded
to an abstract WebViewProvider interface, and the existing implementation
moved into the WebViewClassic implementor of this interface.
Originally taken from a snapshot from the development branch, by:
git diff HEAD 9a4c328a54cc05e5 | git apply
- but then rebased to keep up to date with master
Interdepends on webkit and Browser changes:
https://android-git.corp.google.com/g/158979
https://android-git.corp.google.com/g/167911
Change-Id: I91403f32654ff308934e95c832d17b292a7d9b2e
Diffstat (limited to 'core/java/android/webkit/OverScrollGlow.java')
| -rw-r--r-- | core/java/android/webkit/OverScrollGlow.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/webkit/OverScrollGlow.java b/core/java/android/webkit/OverScrollGlow.java index e906f7f..d91f860 100644 --- a/core/java/android/webkit/OverScrollGlow.java +++ b/core/java/android/webkit/OverScrollGlow.java @@ -29,7 +29,7 @@ import android.widget.EdgeEffect; * @hide */ public class OverScrollGlow { - private WebView mHostView; + private WebViewClassic mHostView; private EdgeEffect mEdgeGlowTop; private EdgeEffect mEdgeGlowBottom; @@ -39,7 +39,7 @@ public class OverScrollGlow { private int mOverScrollDeltaX; private int mOverScrollDeltaY; - public OverScrollGlow(WebView host) { + public OverScrollGlow(WebViewClassic host) { mHostView = host; Context context = host.getContext(); mEdgeGlowTop = new EdgeEffect(context); @@ -80,7 +80,7 @@ public class OverScrollGlow { mOverScrollDeltaX = 0; } - if (maxY > 0 || mHostView.getOverScrollMode() == View.OVER_SCROLL_ALWAYS) { + if (maxY > 0 || mHostView.getWebView().getOverScrollMode() == View.OVER_SCROLL_ALWAYS) { final int pulledToY = oldY + mOverScrollDeltaY; if (pulledToY < 0) { mEdgeGlowTop.onPull((float) mOverScrollDeltaY / mHostView.getHeight()); @@ -120,7 +120,7 @@ public class OverScrollGlow { * @param rangeY Maximum range for vertical scrolling */ public void absorbGlow(int x, int y, int oldX, int oldY, int rangeX, int rangeY) { - if (rangeY > 0 || mHostView.getOverScrollMode() == View.OVER_SCROLL_ALWAYS) { + if (rangeY > 0 || mHostView.getWebView().getOverScrollMode() == View.OVER_SCROLL_ALWAYS) { if (y < 0 && oldY >= 0) { mEdgeGlowTop.onAbsorb((int) mHostView.mScroller.getCurrVelocity()); if (!mEdgeGlowBottom.isFinished()) { |
