summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/WebView.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-03-17 20:17:04 -0700
committerAdam Powell <adamp@google.com>2010-03-17 20:33:07 -0700
commit8a836a8b98557263152a476f614b6e05e19ffc5a (patch)
tree282a382a43499d033ed2672c95d6f5b367e24835 /core/java/android/webkit/WebView.java
parent6c261f327a58ebf1393ef94c9228d11771fe65cc (diff)
Eliminate haptic feedback when hitting an overscroll barrier due to a fling.
Change-Id: I434ec3edd95a19677ad9dbd1ac5ca3f3f5d091cb
Diffstat (limited to 'core/java/android/webkit/WebView.java')
-rw-r--r--core/java/android/webkit/WebView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 3a34fb441109..39b87fee49f2 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2670,7 +2670,7 @@ public class WebView extends AbsoluteLayout
if (oldX != x || oldY != y) {
overscrollBy(x - oldX, y - oldY, oldX, oldY,
computeMaxScrollX(), computeMaxScrollY(),
- getViewWidth() / 3, getViewHeight() / 3);
+ getViewWidth() / 3, getViewHeight() / 3, false);
onScrollChanged(mScrollX, mScrollY, oldX, oldY);
}
} else {
@@ -5021,7 +5021,7 @@ public class WebView extends AbsoluteLayout
if ((deltaX | deltaY) != 0) {
overscrollBy(deltaX, deltaY, mScrollX, mScrollY,
computeMaxScrollX(), computeMaxScrollY(),
- getViewWidth() / 3, getViewHeight() / 3);
+ getViewWidth() / 3, getViewHeight() / 3, true);
}
if (!getSettings().getBuiltInZoomControls()) {
boolean showPlusMinus = mMinZoomScale < mMaxZoomScale;