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

am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1

Browse Source 
* commit '87584f51a865cfe8ef19c2b24e858a63cb3e475c':
  Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances
This commit is contained in:
Adam Powell
2011-03-11 16:41:50 -08:00
committed by Android Git Automerger
parent dd264f21e6 87584f51a8
commit f7db87f073
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/webkit/ZoomManager.java
View File

@@ -777,12 +777,15 @@ class ZoomManager {
}
private class ScaleDetectorListener implements ScaleGestureDetector.OnScaleGestureListener {
private float mAccumulatedSpan;
public boolean onScaleBegin(ScaleGestureDetector detector) {
mInitialZoomOverview = false;
dismissZoomPicker();
mFocusMovementQueue.clear();
mWebView.mViewManager.startZoom();
mWebView.onPinchToZoomAnimationStart();
mAccumulatedSpan = 0;
return true;
}
@@ -797,8 +800,15 @@ class ZoomManager {
FloatMath.sqrt((mFocusX - prevFocusX) * (mFocusX - prevFocusX)
+ (mFocusY - prevFocusY) * (mFocusY - prevFocusY));
mFocusMovementQueue.add(focusDelta);
float deltaSpan = Math.abs(detector.getCurrentSpan() - detector.getPreviousSpan());
return mFocusMovementQueue.getSum() > deltaSpan;
float deltaSpan = detector.getCurrentSpan() - detector.getPreviousSpan() +
mAccumulatedSpan;
final boolean result = mFocusMovementQueue.getSum() > Math.abs(deltaSpan);
if (result) {
mAccumulatedSpan += deltaSpan;
} else {
mAccumulatedSpan = 0;
}
return result;
}
public boolean handleScale(ScaleGestureDetector detector) {