diff options
| author | Mindy Pereira <mindyp@google.com> | 2014-05-01 20:43:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 20:43:52 +0000 |
| commit | 5f81193f801f77c0c00bcc4f65a68bd995e7b954 (patch) | |
| tree | eb4f1fea9f6dc4b41e054a14bf924bd6b2fad760 /core/java/android/view/ViewConfiguration.java | |
| parent | 99013a24a51260f8f276c58916728c241e3add63 (diff) | |
| parent | ed7e36dc2ef400916356459f9ea67d66645a85fb (diff) | |
am ed7e36dc: am d5e92318: Merge "Update fling min velocity" into klp-modular-dev
* commit 'ed7e36dc2ef400916356459f9ea67d66645a85fb':
Update fling min velocity
Diffstat (limited to 'core/java/android/view/ViewConfiguration.java')
| -rw-r--r-- | core/java/android/view/ViewConfiguration.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index 5112b9a432ee..48a5bd55a136 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -287,8 +287,6 @@ public class ViewConfiguration { mEdgeSlop = (int) (sizeAndDensity * EDGE_SLOP + 0.5f); mFadingEdgeLength = (int) (sizeAndDensity * FADING_EDGE_LENGTH + 0.5f); - mMinimumFlingVelocity = (int) (density * MINIMUM_FLING_VELOCITY + 0.5f); - mMaximumFlingVelocity = (int) (density * MAXIMUM_FLING_VELOCITY + 0.5f); mScrollbarSize = (int) (density * SCROLL_BAR_SIZE + 0.5f); mDoubleTapSlop = (int) (sizeAndDensity * DOUBLE_TAP_SLOP + 0.5f); mWindowTouchSlop = (int) (sizeAndDensity * WINDOW_TOUCH_SLOP + 0.5f); @@ -339,6 +337,11 @@ public class ViewConfiguration { mPagingTouchSlop = mTouchSlop * 2; mDoubleTapTouchSlop = mTouchSlop; + + mMinimumFlingVelocity = res.getDimensionPixelSize( + com.android.internal.R.dimen.config_viewMinFlingVelocity); + mMaximumFlingVelocity = res.getDimensionPixelSize( + com.android.internal.R.dimen.config_viewMaxFlingVelocity); } /** |