diff options
author | Winson Chung <winsonc@google.com> | 2012-04-12 10:55:11 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 10:55:11 -0700 |
commit | 2c2b28ae557f83b3d114afeedb61c546a503eb99 (patch) | |
tree | e78a73ed89a531b0a860526ff68e432dba5f928b /src/com/android/launcher2/DragController.java | |
parent | 64c9ab318817d5f098fa0fed7d893f630189b657 (diff) | |
parent | a2413751e3a698aef9c87411a639637883856939 (diff) | |
download | android_packages_apps_Trebuchet-2c2b28ae557f83b3d114afeedb61c546a503eb99.tar.gz android_packages_apps_Trebuchet-2c2b28ae557f83b3d114afeedb61c546a503eb99.tar.bz2 android_packages_apps_Trebuchet-2c2b28ae557f83b3d114afeedb61c546a503eb99.zip |
Merge "Adding delay upon user interaction to prevent the new-app animation from taking over your phone. (Bug 6248609)"
Diffstat (limited to 'src/com/android/launcher2/DragController.java')
-rw-r--r-- | src/com/android/launcher2/DragController.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index aec8940d8..59dcc5bff 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -440,6 +440,19 @@ public class DragController { return mTmpPoint; } + private long mLastTouchUpTime = -1; + long getLastGestureUpTime() { + if (mDragging) { + return System.currentTimeMillis(); + } else { + return mLastTouchUpTime; + } + } + + void resetLastGestureUpTime() { + mLastTouchUpTime = -1; + } + /** * Call this from a drag source view. */ @@ -467,6 +480,7 @@ public class DragController { mLastDropTarget = null; break; case MotionEvent.ACTION_UP: + mLastTouchUpTime = System.currentTimeMillis(); if (mDragging) { PointF vec = isFlingingToDelete(mDragObject.dragSource); if (vec != null) { |