DO NOT MERGE (19c9df3c) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+28 −30

Original line number	Original line	Diff line number	Diff line
	@@ -3729,6 +3729,9 @@ public class WebView extends AbsoluteLayout
	public boolean onScaleBegin(ScaleGestureDetector detector) {		public boolean onScaleBegin(ScaleGestureDetector detector) {
	// cancel the single touch handling		// cancel the single touch handling
	cancelTouch();		cancelTouch();
			if (mZoomButtonsController.isVisible()) {
			mZoomButtonsController.setVisible(false);
			}
	// reset the zoom overview mode so that the page won't auto grow		// reset the zoom overview mode so that the page won't auto grow
	mInZoomOverview = false;		mInZoomOverview = false;
	// If it is in password mode, turn it off so it does not draw		// If it is in password mode, turn it off so it does not draw
	@@ -3937,7 +3940,6 @@ public class WebView extends AbsoluteLayout
	if (!mDragFromTextInput) {		if (!mDragFromTextInput) {
	nativeHideCursor();		nativeHideCursor();
	}		}
	if (!mSupportMultiTouch) {
	WebSettings settings = getSettings();		WebSettings settings = getSettings();
	if (settings.supportZoom()		if (settings.supportZoom()
	&& settings.getBuiltInZoomControls()		&& settings.getBuiltInZoomControls()
	@@ -3953,7 +3955,6 @@ public class WebView extends AbsoluteLayout
	}		}
	}		}
	}		}
	}

	// do pan		// do pan
	int newScrollX = pinLocX(mScrollX + deltaX);		int newScrollX = pinLocX(mScrollX + deltaX);
	@@ -4029,8 +4030,7 @@ public class WebView extends AbsoluteLayout
	mUserScroll = true;		mUserScroll = true;
	}		}

	if (!mSupportMultiTouch		if (!getSettings().getBuiltInZoomControls()) {
	&& !getSettings().getBuiltInZoomControls()) {
	boolean showPlusMinus = mMinZoomScale < mMaxZoomScale;		boolean showPlusMinus = mMinZoomScale < mMaxZoomScale;
	if (mZoomControls != null && showPlusMinus) {		if (mZoomControls != null && showPlusMinus) {
	if (mZoomControls.getVisibility() == View.VISIBLE) {		if (mZoomControls.getVisibility() == View.VISIBLE) {
	@@ -4776,7 +4776,6 @@ public class WebView extends AbsoluteLayout
	mAnchorX = viewToContentX((int) mZoomCenterX + mScrollX);		mAnchorX = viewToContentX((int) mZoomCenterX + mScrollX);
	mAnchorY = viewToContentY((int) mZoomCenterY + mScrollY);		mAnchorY = viewToContentY((int) mZoomCenterY + mScrollY);
	WebSettings settings = getSettings();		WebSettings settings = getSettings();
	if (!mSupportMultiTouch) {
	// remove the zoom control after double tap		// remove the zoom control after double tap
	if (settings.getBuiltInZoomControls()) {		if (settings.getBuiltInZoomControls()) {
	if (mZoomButtonsController.isVisible()) {		if (mZoomButtonsController.isVisible()) {
	@@ -4791,7 +4790,6 @@ public class WebView extends AbsoluteLayout
	}		}
	}		}
	settings.setDoubleTapToastCount(0);		settings.setDoubleTapToastCount(0);
	}
	if ((settings.getLayoutAlgorithm() == WebSettings.LayoutAlgorithm.NARROW_COLUMNS)		if ((settings.getLayoutAlgorithm() == WebSettings.LayoutAlgorithm.NARROW_COLUMNS)
	&& (Math.abs(mActualScale - mTextWrapScale) >= 0.01f)) {		&& (Math.abs(mActualScale - mTextWrapScale) >= 0.01f)) {
	setNewZoomScale(mActualScale, true, true);		setNewZoomScale(mActualScale, true, true);