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

Commit f32d43b2 authored by Shimeng (Simon) Wang's avatar Shimeng (Simon) Wang Committed by Android (Google) Code Review
Browse files

Merge "Make sure scale will not go beyond overview scale after rotation."

parents bd24eb55 ebf76277

core/java/android/webkit/ZoomManager.java

+3 −2
Original line number Diff line number Diff line
@@ -1006,8 +1006,9 @@ class ZoomManager { 
        boolean mobileSiteInOverview = mInZoomOverview &&

                !exceedsMinScaleIncrement(newZoomOverviewScale, 1.0f);

        if (!mWebView.drawHistory() &&

                (mInitialZoomOverview || scaleLessThanOverview || mobileSiteInOverview) &&

                scaleHasDiff && zoomOverviewWidthChanged) {

            (scaleLessThanOverview ||

                ((mInitialZoomOverview || mobileSiteInOverview) &&

                    scaleHasDiff && zoomOverviewWidthChanged))) {

            mInitialZoomOverview = false;

            setZoomScale(newZoomOverviewScale, !willScaleTriggerZoom(mTextWrapScale) &&

                !mWebView.getSettings().getUseFixedViewport());