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

Commit 437f79b6 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 21637 into eclair 

* changes:
  Fix 2058938. As zoom control is uesd in overview mode to switch to reading mode, we also want to hide it after double tap is done.
parents 30c1738b d7660ccb

core/java/android/webkit/WebView.java

+13 −12
Original line number Diff line number Diff line
@@ -4689,7 +4689,7 @@ public class WebView extends AbsoluteLayout 
        mZoomCenterY = mLastTouchY;

        mInZoomOverview = !mInZoomOverview;

        mCallbackProxy.uiOnChangeViewingMode(mInZoomOverview);

        if (mInZoomOverview) {

        // remove the zoom control after double tap

        if (getSettings().getBuiltInZoomControls()) {

            if (mZoomButtonsController.isVisible()) {

                mZoomButtonsController.setVisible(false);
@@ -4702,6 +4702,7 @@ public class WebView extends AbsoluteLayout 
                mZoomControls.hide();

            }

        }

        if (mInZoomOverview) {

            zoomWithPreview((float) getViewWidth() / mZoomOverviewWidth);

        } else {

            // mLastTouchX and mLastTouchY are the point in the current viewport