summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-07-06 11:51:18 -0700
committerRomain Guy <romainguy@android.com>2009-07-06 11:51:18 -0700
commita206daaed1318005d1534cca2e4eeec56144d104 (patch)
tree2a86819d54b215380f1b9ea54ccfee625cf7d3e0
parentaafeef310fab2b2e62850b09fe25411e65fe3171 (diff)
downloadLauncher-a206daaed1318005d1534cca2e4eeec56144d104.tar.gz
Related to #1444844. Caps fling velocity on Home.
-rw-r--r--src/com/android/launcher/Workspace.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher/Workspace.java b/src/com/android/launcher/Workspace.java
index d91519c..f5dc633 100644
--- a/src/com/android/launcher/Workspace.java
+++ b/src/com/android/launcher/Workspace.java
@@ -106,6 +106,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
private boolean mLocked;
private int mTouchSlop;
+ private int mMaximumVelocity;
final Rect mDrawerBounds = new Rect();
final Rect mClipBounds = new Rect();
@@ -150,7 +151,9 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
mPaint = new Paint();
mPaint.setDither(false);
- mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
+ final ViewConfiguration configuration = ViewConfiguration.get(getContext());
+ mTouchSlop = configuration.getScaledTouchSlop();
+ mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
}
/**
@@ -813,7 +816,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
case MotionEvent.ACTION_UP:
if (mTouchState == TOUCH_STATE_SCROLLING) {
final VelocityTracker velocityTracker = mVelocityTracker;
- velocityTracker.computeCurrentVelocity(1000);
+ velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
int velocityX = (int) velocityTracker.getXVelocity();
if (velocityX > SNAP_VELOCITY && mCurrentScreen > 0) {