Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE

Browse Source 
Remove testing (enable plugin) code.

No reflow when zoom in, auto reflow when zoom out.

Fix http://b/issue?id=2375955
This commit is contained in:
Grace Kloba
2010-01-15 16:02:57 -08:00
parent d79d1c7299
commit 5a0bf1f03e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebView.java
View File

@@ -3747,8 +3747,10 @@ public class WebView extends AbsoluteLayout
mPreviewZoomOnly = false; mPreviewZoomOnly = false;
mAnchorX = viewToContentX((int) mZoomCenterX + mScrollX); mAnchorX = viewToContentX((int) mZoomCenterX + mScrollX);
mAnchorY = viewToContentY((int) mZoomCenterY + mScrollY); mAnchorY = viewToContentY((int) mZoomCenterY + mScrollY);
// for testing only, default don't reflow now // don't reflow when zoom in; when zoom out, do reflow if the
boolean reflowNow = !getSettings().getPluginsEnabled(); // new scale is almost minimum scale;
boolean reflowNow = (mActualScale - mMinZoomScale <= 0.01f)
|| ((mActualScale <= 0.8 * mTextWrapScale));
// force zoom after mPreviewZoomOnly is set to false so that the // force zoom after mPreviewZoomOnly is set to false so that the
// new view size will be passed to the WebKit // new view size will be passed to the WebKit
setNewZoomScale(mActualScale, reflowNow, true); setNewZoomScale(mActualScale, reflowNow, true);