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

am cbe397f2: Merge "b/3348192 re-enable snap scrolling mode." into honeycomb

Browse Source 
* commit 'cbe397f243c4f1706cf7bbd9fcd07c1c13ccb097':
  b/3348192 re-enable snap scrolling mode.
This commit is contained in:
Huahui Wu
2011-01-14 13:05:04 -08:00
committed by Android Git Automerger
parent 014ef61842 cbe397f243
commit ee2d8cd5bc
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5586,6 +5586,24 @@ public class WebView extends AbsoluteLayout
break;
}
// Only lock dragging to one axis if we don't have a scale in progress.
// Scaling implies free-roaming movement. Note this is only ever a question
// if mZoomManager.supportsPanDuringZoom() is true.
final ScaleGestureDetector detector =
mZoomManager.getMultiTouchGestureDetector();
if (detector == null || !detector.isInProgress()) {
// if it starts nearly horizontal or vertical, enforce it
int ax = Math.abs(deltaX);
int ay = Math.abs(deltaY);
if (ax > MAX_SLOPE_FOR_DIAG * ay) {
mSnapScrollMode = SNAP_X;
mSnapPositive = deltaX > 0;
} else if (ay > MAX_SLOPE_FOR_DIAG * ax) {
mSnapScrollMode = SNAP_Y;
mSnapPositive = deltaY > 0;
}
}
mTouchMode = TOUCH_DRAG_MODE;
mLastTouchX = x;
mLastTouchY = y;