diff options
| author | Grace Kloba <klobag@google.com> | 2010-04-23 15:27:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-23 15:27:58 -0700 |
| commit | 85a8dcec5460edda72e9917d4f02ad1b6a133251 (patch) | |
| tree | a76f393d1425c93ecaac592a752100f6c4e461ab /core/java/android | |
| parent | 8b0047f82504ebc9b282ed950a85a758b59c4e14 (diff) | |
| parent | 0653d22f6279a81cbad27d8b0d5729f43ae1d66e (diff) | |
Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 66dad0bc107b..6f4c6ffc8708 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2286,7 +2286,9 @@ public class WebView extends AbsoluteLayout protected int computeHorizontalScrollRange() { if (mDrawHistory) { return mHistoryWidth; - } else if (mHorizontalScrollBarMode == SCROLLBAR_ALWAYSOFF) { + } else if (mHorizontalScrollBarMode == SCROLLBAR_ALWAYSOFF + && (mActualScale - mMinZoomScale <= MINIMUM_SCALE_INCREMENT)) { + // only honor the scrollbar mode when it is at minimum zoom level return computeHorizontalScrollExtent(); } else { // to avoid rounding error caused unnecessary scrollbar, use floor @@ -2298,7 +2300,9 @@ public class WebView extends AbsoluteLayout protected int computeVerticalScrollRange() { if (mDrawHistory) { return mHistoryHeight; - } else if (mVerticalScrollBarMode == SCROLLBAR_ALWAYSOFF) { + } else if (mVerticalScrollBarMode == SCROLLBAR_ALWAYSOFF + && (mActualScale - mMinZoomScale <= MINIMUM_SCALE_INCREMENT)) { + // only honor the scrollbar mode when it is at minimum zoom level return computeVerticalScrollExtent(); } else { // to avoid rounding error caused unnecessary scrollbar, use floor |