diff options
| author | John Reck <jreck@google.com> | 2012-06-07 17:21:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-07 17:21:35 -0700 |
| commit | 5c25762bcf6508a1cb3d9bbcfa7a968ede00005a (patch) | |
| tree | 1be7c1e547e30302d17a6bdc9322f676ea683313 /core/java/android/webkit/WebViewClassic.java | |
| parent | bc35b34a7ca0d3fddccd0c6f4e488cf228b42149 (diff) | |
| parent | 13b9d28268d76b886be0a8cbd15a1d059c276d6b (diff) | |
am 13b9d282: am 0e0ce11e: Merge "Stay in layer scroll if nothing to scroll" into jb-dev
* commit '13b9d28268d76b886be0a8cbd15a1d059c276d6b':
Stay in layer scroll if nothing to scroll
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index d0f9d115210c..90ac47ac63c6 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -6224,8 +6224,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc final int resultY = Math.max(0, Math.min(mScrollingLayerRect.top + contentY, maxY)); - if (resultX != mScrollingLayerRect.left || - resultY != mScrollingLayerRect.top) { + if (resultX != mScrollingLayerRect.left + || resultY != mScrollingLayerRect.top + || (contentX | contentY) == 0) { // In case we switched to dragging the page. mTouchMode = TOUCH_DRAG_LAYER_MODE; deltaX = contentX; |