diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-14 19:32:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-14 19:32:45 -0800 |
| commit | 88196464e91dd533f2dd28a02f55b7e4801eead0 (patch) | |
| tree | d34537cf8a7c15b5f2cf9e5b318e5d80a4ed7da3 | |
| parent | c8cab72521781091e87049861c4b25fb19197ea4 (diff) | |
| parent | 4d69ac6695246b8df06a6583044dc4712d81a956 (diff) | |
| download | frameworks_base-88196464e91dd533f2dd28a02f55b7e4801eead0.zip frameworks_base-88196464e91dd533f2dd28a02f55b7e4801eead0.tar.gz frameworks_base-88196464e91dd533f2dd28a02f55b7e4801eead0.tar.bz2 | |
am 4d69ac66: Merge "DO NOT MERGE" into eclair
Merge commit '4d69ac6695246b8df06a6583044dc4712d81a956' into eclair-plus-aosp
* commit '4d69ac6695246b8df06a6583044dc4712d81a956':
DO NOT MERGE
| -rw-r--r-- | core/java/android/webkit/WebView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 7d0c53b..5321560 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -5206,7 +5206,8 @@ public class WebView extends AbsoluteLayout if (Math.abs((viewWidth * mInvActualScale) - mZoomOverviewWidth) > 1) { setNewZoomScale((float) viewWidth - / mZoomOverviewWidth, true, false); + / mZoomOverviewWidth, Math.abs(mActualScale + - mTextWrapScale) < 0.01f, false); } } break; |