Suppress scrollbars during layer fling.

Change-Id: Ia6bc1f48e464212d5b9cebef27e4527b0bc93713

1 files changed, 6 insertions, 1 deletions

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index c6cf9183a1f4..cc4b0ad918df 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();
     }