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

Merge "Keep mobile site's text wrap scale unchanged."

Browse Source
This commit is contained in:
Shimeng (Simon) Wang
2011-02-15 10:12:29 -08:00
committed by Android (Google) Code Review
parent 6b5e593725 a7699fea04
commit 0a20767f61
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/webkit/ZoomManager.java
View File

@@ -846,22 +846,29 @@ class ZoomManager {
public void onNewPicture(WebViewCore.DrawData drawData) {
final int viewWidth = mWebView.getViewWidth();
final boolean zoomOverviewWidthChanged = setupZoomOverviewWidth(drawData, viewWidth);
final float newZoomOverviewScale = getZoomOverviewScale();
WebSettings settings = mWebView.getSettings();
if (zoomOverviewWidthChanged && settings.isNarrowColumnLayout() &&
settings.getUseFixedViewport() &&
(mInitialZoomOverview || mInZoomOverview)) {
mTextWrapScale = getReadingLevelScale();
// Keep mobile site's text wrap scale unchanged. For mobile sites,
// the text wrap scale is the same as zoom overview scale, which is 1.0f.
if (exceedsMinScaleIncrement(mTextWrapScale, 1.0f) ||
exceedsMinScaleIncrement(newZoomOverviewScale, 1.0f)) {
mTextWrapScale = getReadingLevelScale();
} else {
mTextWrapScale = newZoomOverviewScale;
}
}
final float zoomOverviewScale = getZoomOverviewScale();
if (!mMinZoomScaleFixed) {
mMinZoomScale = zoomOverviewScale;
mMinZoomScale = newZoomOverviewScale;
}
// fit the content width to the current view. Ignore the rounding error case.
if (!mWebView.drawHistory() && (mInitialZoomOverview || (mInZoomOverview
&& Math.abs((viewWidth * mInvActualScale) - mZoomOverviewWidth) > 1))) {
mInitialZoomOverview = false;
setZoomScale(zoomOverviewScale, !willScaleTriggerZoom(mTextWrapScale) &&
setZoomScale(newZoomOverviewScale, !willScaleTriggerZoom(mTextWrapScale) &&
!mWebView.getSettings().getUseFixedViewport());
}
}