Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f080a5ad: Merge "DO NOT MERGE" into eclair

Browse Source 
Merge commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp

* commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89':
  DO NOT MERGE
This commit is contained in:
Grace Kloba
2010-01-18 23:43:14 -08:00
committed by Android Git Automerger
parent 84928fa93c f080a5adf6
commit 3648f949ef
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
core/java/android/webkit/WebView.java
View File

@@ -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,20 +3940,18 @@ 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() && !mZoomButtonsController.isVisible()
&& !mZoomButtonsController.isVisible() && mMinZoomScale < mMaxZoomScale) {
&& mMinZoomScale < mMaxZoomScale) { mZoomButtonsController.setVisible(true);
mZoomButtonsController.setVisible(true); int count = settings.getDoubleTapToastCount();
int count = settings.getDoubleTapToastCount(); if (mInZoomOverview && count > 0) {
if (mInZoomOverview && count > 0) { settings.setDoubleTapToastCount(--count);
settings.setDoubleTapToastCount(--count); Toast.makeText(mContext,
Toast.makeText(mContext, com.android.internal.R.string.double_tap_toast,
com.android.internal.R.string.double_tap_toast, Toast.LENGTH_LONG).show();
Toast.LENGTH_LONG).show();
}
} }
} }
} }
@@ -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,22 +4776,20 @@ 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()) { mZoomButtonsController.setVisible(false);
mZoomButtonsController.setVisible(false); }
} } else {
} else { if (mZoomControlRunnable != null) {
if (mZoomControlRunnable != null) { mPrivateHandler.removeCallbacks(mZoomControlRunnable);
mPrivateHandler.removeCallbacks(mZoomControlRunnable); }
} if (mZoomControls != null) {
if (mZoomControls != null) { mZoomControls.hide();
mZoomControls.hide();
}
} }
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);