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

am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1

Browse Source 
* commit '12c37cafe184d5a6ac2a7a097c2fc616e5c1a6c8':
  Consider mInitialScale when setting min zoom scale.
This commit is contained in:
Shimeng (Simon) Wang
2011-03-09 10:51:26 -08:00
committed by Android Git Automerger
parent 094c9900de 12c37cafe1
commit 246b2b313c
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) {