diff options
| author | Patrick Scott <phanna@android.com> | 2010-12-13 09:30:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-13 09:30:27 -0800 |
| commit | d2f44b7a3249336cd54eea836344f3a336421fdd (patch) | |
| tree | fc594be560ecb42a54e032f26684ab6a6ef75fad | |
| parent | b6a0dfb0f19492f9d685541033b47922a817eb34 (diff) | |
| parent | 5b87e296c5bd24b9df00723b51cc80f4777f413d (diff) | |
| download | frameworks_base-d2f44b7a3249336cd54eea836344f3a336421fdd.zip frameworks_base-d2f44b7a3249336cd54eea836344f3a336421fdd.tar.gz frameworks_base-d2f44b7a3249336cd54eea836344f3a336421fdd.tar.bz2 | |
Merge "Suppress scrollbars during layer fling."
| -rw-r--r-- | core/java/android/webkit/WebView.java | 7 |
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(); } |