diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 13:12:36 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-06 13:12:36 -0700 |
| commit | 005ae544f93494eb7d315b2e34aae0ac3c922728 (patch) | |
| tree | a7d55705579d3b2e1c7f8d3cd46ba328ef656604 /core/java/android/webkit | |
| parent | dd3d10c865b0d0e980b6fc33cae558ba057b57c9 (diff) | |
| parent | 79ec07b333f8982ee83de8eeb0b1927a6cb112ed (diff) | |
| download | frameworks_base-005ae544f93494eb7d315b2e34aae0ac3c922728.zip frameworks_base-005ae544f93494eb7d315b2e34aae0ac3c922728.tar.gz frameworks_base-005ae544f93494eb7d315b2e34aae0ac3c922728.tar.bz2 | |
am 79ec07b3: Merge change 6241 into donut
Merge commit '79ec07b333f8982ee83de8eeb0b1927a6cb112ed'
* commit '79ec07b333f8982ee83de8eeb0b1927a6cb112ed':
Fixes #1444844. Set a maximum fling velocity in scrollable views.
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 61c0cb9..b2f2e51 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -349,6 +349,7 @@ public class WebView extends AbsoluteLayout * Helper class to get velocity for fling */ VelocityTracker mVelocityTracker; + private int mMaximumFling; /** * Touch mode @@ -754,7 +755,8 @@ public class WebView extends AbsoluteLayout setClickable(true); setLongClickable(true); - final int slop = ViewConfiguration.get(getContext()).getScaledTouchSlop(); + final ViewConfiguration configuration = ViewConfiguration.get(getContext()); + final int slop = configuration.getScaledTouchSlop(); mTouchSlopSquare = slop * slop; mMinLockSnapReverseDistance = slop; final float density = getContext().getResources().getDisplayMetrics().density; @@ -770,6 +772,7 @@ public class WebView extends AbsoluteLayout DEFAULT_MIN_ZOOM_SCALE = 0.25f * density; mMaxZoomScale = DEFAULT_MAX_ZOOM_SCALE; mMinZoomScale = DEFAULT_MIN_ZOOM_SCALE; + mMaximumFling = configuration.getScaledMaximumFlingVelocity(); } /* package */void updateDefaultZoomDensity(int zoomDensity) { @@ -4309,7 +4312,7 @@ public class WebView extends AbsoluteLayout int maxX = Math.max(computeHorizontalScrollRange() - getViewWidth(), 0); int maxY = Math.max(computeVerticalScrollRange() - getViewHeight(), 0); - mVelocityTracker.computeCurrentVelocity(1000); + mVelocityTracker.computeCurrentVelocity(1000, mMaximumFling); int vx = (int) mVelocityTracker.getXVelocity(); int vy = (int) mVelocityTracker.getYVelocity(); |