diff options
| author | Winson Chung <winsonc@google.com> | 2011-07-01 15:35:26 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-07-06 20:48:45 -0700 |
| commit | c07918d0053fc7d2a19d7b013565a5d2e7d4af51 (patch) | |
| tree | 1fe589183691f04dcc6d2a280e283d49faa6f6e7 /src/com/android/launcher2/SpringLoadedDragController.java | |
| parent | d044526d82e7938cf35b296978d9d5302f98b4af (diff) | |
| download | android_packages_apps_Trebuchet-c07918d0053fc7d2a19d7b013565a5d2e7d4af51.tar.gz android_packages_apps_Trebuchet-c07918d0053fc7d2a19d7b013565a5d2e7d4af51.tar.bz2 android_packages_apps_Trebuchet-c07918d0053fc7d2a19d7b013565a5d2e7d4af51.zip | |
Cleaning up some spring-loaded related dragging code. Allow cancel spring loaded mode.
Change-Id: Ie1f0468c563bed7abc1aa6416e222cdb0853c03a
Diffstat (limited to 'src/com/android/launcher2/SpringLoadedDragController.java')
| -rw-r--r-- | src/com/android/launcher2/SpringLoadedDragController.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/SpringLoadedDragController.java b/src/com/android/launcher2/SpringLoadedDragController.java index 37a94d48f..0d4785d49 100644 --- a/src/com/android/launcher2/SpringLoadedDragController.java +++ b/src/com/android/launcher2/SpringLoadedDragController.java @@ -40,6 +40,7 @@ public class SpringLoadedDragController implements OnAlarmListener { // Set a new alarm to expire for the screen that we are hovering over now public void setAlarm(CellLayout cl) { if (mScreen != cl) { + mAlarm.cancelAlarm(); mAlarm.setAlarm(ENTER_SPRING_LOAD_HOVER_TIME); } mScreen = cl; @@ -52,6 +53,8 @@ public class SpringLoadedDragController implements OnAlarmListener { Workspace w = mLauncher.getWorkspace(); int page = w.indexOfChild(mScreen); w.snapToPage(page); + } else { + mLauncher.getDragController().cancelDrag(); } } } |