Merge "DO NOT MERGE" into eclair (f080a5ad) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+28 −30

Original line number	Diff line number	Diff line
		@@ -3729,6 +3729,9 @@ public class WebView extends AbsoluteLayout
		public boolean onScaleBegin(ScaleGestureDetector detector) {
		// cancel the single touch handling
		cancelTouch();
		if (mZoomButtonsController.isVisible()) {
		mZoomButtonsController.setVisible(false);
		}
		// reset the zoom overview mode so that the page won't auto grow
		mInZoomOverview = false;
		// 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) {
		nativeHideCursor();
		}
		if (!mSupportMultiTouch) {
		WebSettings settings = getSettings();
		if (settings.supportZoom()
		&& settings.getBuiltInZoomControls()
		@@ -3953,7 +3955,6 @@ public class WebView extends AbsoluteLayout
		}
		}
		}
		}

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

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