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

Commit 6d3e51d4 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1 

* commit '43bc6b09':
  Fix updateDoubleTapZoom logic
parents 9f3f3c2f 43bc6b09

core/java/android/webkit/ZoomManager.java

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



    public void updateDoubleTapZoom(int doubleTapZoom) {

        if (mInZoomOverview) {

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

        mDoubleTapZoomFactor = doubleTapZoom / 100.0f;

        mTextWrapScale = getReadingLevelScale();

            refreshZoomScale(true);

        }

        float newScale = zoomIn ? mTextWrapScale

                : Math.min(mTextWrapScale, mActualScale);

        setZoomScale(newScale, true, true);

    }



    public void refreshZoomScale(boolean reflowText) {