summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/WebView.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index c6cf918..cc4b0ad 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -6248,7 +6248,12 @@ public class WebView extends AbsoluteLayout
// resumes during this effect we will take a performance hit. See computeScroll;
// we resume webcore there when the animation is finished.
final int time = mScroller.getDuration();
- awakenScrollBars(time);
+
+ // Suppress scrollbars for layer scrolling.
+ if (mTouchMode != TOUCH_DRAG_LAYER_MODE) {
+ awakenScrollBars(time);
+ }
+
invalidate();
}