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

Commit 76c29e63 authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files

am f167c4bf: DO NOT MERGE 

Merge commit 'f167c4bf' into eclair-plus-aosp

* commit 'f167c4bf':
  DO NOT MERGE
parents b869c594 f167c4bf

core/java/android/webkit/WebView.java

+5 −1
Original line number Diff line number Diff line
@@ -4792,6 +4792,7 @@ public class WebView extends AbsoluteLayout 
            }

        }

        settings.setDoubleTapToastCount(0);

        boolean zoomToDefault = false;

        if ((settings.getLayoutAlgorithm() == WebSettings.LayoutAlgorithm.NARROW_COLUMNS)

                && (Math.abs(mActualScale - mTextWrapScale) >= 0.01f)) {

            setNewZoomScale(mActualScale, true, true);
@@ -4807,9 +4808,12 @@ public class WebView extends AbsoluteLayout 
                if (mScrollY < getTitleHeight()) mScrollY = 0;

                zoomWithPreview(newScale);

            } else if (Math.abs(mActualScale - mDefaultScale) >= 0.01f) {

                mInZoomOverview = true;

                zoomToDefault = true;

            }

        } else {

            zoomToDefault = true;

        }

        if (zoomToDefault) {

            mInZoomOverview = false;

            int left = nativeGetBlockLeftEdge(mAnchorX, mAnchorY, mActualScale);

            if (left != NO_LEFTEDGE) {