Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2598bf60 authored by Shimeng (Simon) Wang's avatar Shimeng (Simon) Wang Committed by Android Git Automerger
Browse files

am 246b2b31: am 12c37caf: Merge "Consider mInitialScale when setting min zoom... 

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

* commit '246b2b31':
  Consider mInitialScale when setting min zoom scale.
parents e18a4067 246b2b31

core/java/android/webkit/ZoomManager.java

+3 −2
Original line number Diff line number Diff line
@@ -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) {