drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1

Browse Source
This commit is contained in:
Shimeng (Simon) Wang
2011-03-09 10:48:57 -08:00
committed by Android (Google) Code Review
parent 2c3ed82600 633c3775a9
commit 12c37cafe1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1008,14 +1008,15 @@ class ZoomManager {
final Point viewSize = drawData.mViewSize;
updateZoomRange(viewState, viewSize.x, drawData.mMinPrefWidth);
setupZoomOverviewWidth(drawData, mWebView.getViewWidth());
final float overviewScale = getZoomOverviewScale();
if (!mMinZoomScaleFixed) {
mMinZoomScale = getZoomOverviewScale();
mMinZoomScale = (mInitialScale > 0) ?
Math.min(mInitialScale, overviewScale) : overviewScale;
mMaxZoomScale = Math.max(mMaxZoomScale, mMinZoomScale);
}
if (!mWebView.drawHistory()) {
float scale;
final float overviewScale = getZoomOverviewScale();
WebSettings settings = mWebView.getSettings();
if (mInitialScale > 0) {