summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebView.java
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-12-13 09:20:32 -0500
committerPatrick Scott <phanna@android.com>2010-12-13 09:20:32 -0500
commit5b87e296c5bd24b9df00723b51cc80f4777f413d (patch)
tree0bf3aaa234ecfb087de32bdf43214839ed456a21 /core/java/android/webkit/WebView.java
parent4e47e716d681b56f6ed2a262ddfd40e0c7a296f5 (diff)
downloadframeworks_base-5b87e296c5bd24b9df00723b51cc80f4777f413d.zip
frameworks_base-5b87e296c5bd24b9df00723b51cc80f4777f413d.tar.gz
frameworks_base-5b87e296c5bd24b9df00723b51cc80f4777f413d.tar.bz2
Suppress scrollbars during layer fling.
Change-Id: Ia6bc1f48e464212d5b9cebef27e4527b0bc93713
Diffstat (limited to 'core/java/android/webkit/WebView.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();
}