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

Commit 633c3775 authored by Shimeng (Simon) Wang's avatar Shimeng (Simon) Wang
Browse files

Consider mInitialScale when setting min zoom scale. 

This fixes CTS test failure.

issue: 4056256
Change-Id: Iee4adba2e462f5e0e79cf359e5b6a1531eafcdd8
parent 055a8585

core/java/android/webkit/ZoomManager.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -960,14 +960,15 @@ class ZoomManager { 
        final Point viewSize = drawData.mViewSize;

        final Point viewSize = drawData.mViewSize;

        updateZoomRange(viewState, viewSize.x, drawData.mMinPrefWidth);

        updateZoomRange(viewState, viewSize.x, drawData.mMinPrefWidth);

        setupZoomOverviewWidth(drawData, mWebView.getViewWidth());

        setupZoomOverviewWidth(drawData, mWebView.getViewWidth());

        final float overviewScale = getZoomOverviewScale();

        if (!mMinZoomScaleFixed) {

        if (!mMinZoomScaleFixed) {

            mMinZoomScale = getZoomOverviewScale();

            mMinZoomScale = (mInitialScale > 0) ?

                    Math.min(mInitialScale, overviewScale) : overviewScale;

            mMaxZoomScale = Math.max(mMaxZoomScale, mMinZoomScale);

            mMaxZoomScale = Math.max(mMaxZoomScale, mMinZoomScale);

        }

        }





        if (!mWebView.drawHistory()) {

        if (!mWebView.drawHistory()) {

            float scale;

            float scale;

            final float overviewScale = getZoomOverviewScale();

            WebSettings settings = mWebView.getSettings();

            WebSettings settings = mWebView.getSettings();





            if (mInitialScale > 0) {

            if (mInitialScale > 0) {