commit c07918d0053fc7d2a19d7b013565a5d2e7d4af51
author Winson Chung <winsonc@google.com> Fri Jul 01 15:35:26 2011 -0700
committer Winson Chung <winsonc@google.com> Wed Jul 06 20:48:45 2011 -0700
tree 1fe589183691f04dcc6d2a280e283d49faa6f6e7
parent d044526d82e7938cf35b296978d9d5302f98b4af

Cleaning up some spring-loaded related dragging code.  Allow cancel spring loaded mode.

Change-Id: Ie1f0468c563bed7abc1aa6416e222cdb0853c03a

src/com/android/launcher2/SpringLoadedDragController.java

diff --git a/src/com/android/launcher2/SpringLoadedDragController.java b/src/com/android/launcher2/SpringLoadedDragController.java
index 37a94d4..0d4785d 100644
--- a/src/com/android/launcher2/SpringLoadedDragController.java
+++ b/src/com/android/launcher2/SpringLoadedDragController.java
@@ -40,6 +40,7 @@
     // 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 @@
             Workspace w = mLauncher.getWorkspace();
             int page = w.indexOfChild(mScreen);
             w.snapToPage(page);
+        } else {
+            mLauncher.getDragController().cancelDrag();
         }
     }
 }