Merge "Better handle double tap for smooth reflow and zoom." (d169d3cb) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebViewCore.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1900,7 +1900,7 @@ public final class WebViewCore {
		width = mViewportWidth;
		} else {
		// For mobile web site.
		width = viewWidth;
		width = mWebView.getViewWidth();
		}
		}
		return width;

+10 −1

Original line number	Diff line number	Diff line
		@@ -634,8 +634,17 @@ class ZoomManager {
		} else {
		newTextWrapScale = mActualScale;
		}
		final boolean firstTimeReflow = !exceedsMinScaleIncrement(mActualScale, mTextWrapScale);
		if (firstTimeReflow \|\| mInZoomOverview) {
		// In case first time reflow or in zoom overview mode, let reflow and zoom
		// happen at the same time.
		mTextWrapScale = newTextWrapScale;
		}
		if (settings.isNarrowColumnLayout()
		&& exceedsMinScaleIncrement(mTextWrapScale, newTextWrapScale)) {
		&& exceedsMinScaleIncrement(mTextWrapScale, newTextWrapScale)
		&& !firstTimeReflow
		&& !mInZoomOverview) {
		// Reflow only.
		mTextWrapScale = newTextWrapScale;
		refreshZoomScale(true);
		} else if (!mInZoomOverview && willScaleTriggerZoom(getZoomOverviewScale())) {