| commit | 4d69ac6695246b8df06a6583044dc4712d81a956 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Thu Jan 14 19:29:09 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 14 19:29:09 2010 -0800 |
| tree | 7c8fe0427428cb3fa49d0ad6ace99d4133443f7a | |
| parent | d1019a99f9b458a4129e047c96de7192a61e5e99 [diff] | |
| parent | fd787ba79de8119dac979bd7b94b94038dc66a8b [diff] |
Merge "DO NOT MERGE" into eclair
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 @@ if (Math.abs((viewWidth * mInvActualScale) - mZoomOverviewWidth) > 1) { setNewZoomScale((float) viewWidth - / mZoomOverviewWidth, true, false); + / mZoomOverviewWidth, Math.abs(mActualScale + - mTextWrapScale) < 0.01f, false); } } break;