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

Commit 43bc6b09 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix updateDoubleTapZoom logic" into ics-mr1

parents 1a3ece9f 05983279

core/java/android/webkit/ZoomManager.java

+6 −5
Original line number Original line Diff line number Diff line
@@ -522,11 +522,12 @@ class ZoomManager { 
    }

    }





    public void updateDoubleTapZoom(int doubleTapZoom) {

    public void updateDoubleTapZoom(int doubleTapZoom) {

        if (mInZoomOverview) {

        boolean zoomIn = (mTextWrapScale - mActualScale) < .1f;

        mDoubleTapZoomFactor = doubleTapZoom / 100.0f;

        mDoubleTapZoomFactor = doubleTapZoom / 100.0f;

        mTextWrapScale = getReadingLevelScale();

        mTextWrapScale = getReadingLevelScale();

            refreshZoomScale(true);

        float newScale = zoomIn ? mTextWrapScale

        }

                : Math.min(mTextWrapScale, mActualScale);

        setZoomScale(newScale, true, true);

    }

    }





    public void refreshZoomScale(boolean reflowText) {

    public void refreshZoomScale(boolean reflowText) {