diff options
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher2/SpringLoadedDragController.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher2/SpringLoadedDragController.java b/src/com/android/launcher2/SpringLoadedDragController.java index 0d4785d49..7b4adf30f 100644 --- a/src/com/android/launcher2/SpringLoadedDragController.java +++ b/src/com/android/launcher2/SpringLoadedDragController.java @@ -39,10 +39,8 @@ 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); - } + mAlarm.cancelAlarm(); + mAlarm.setAlarm(ENTER_SPRING_LOAD_HOVER_TIME); mScreen = cl; } @@ -52,7 +50,9 @@ public class SpringLoadedDragController implements OnAlarmListener { // Snap to the screen that we are hovering over now Workspace w = mLauncher.getWorkspace(); int page = w.indexOfChild(mScreen); - w.snapToPage(page); + if (page != w.getCurrentPage()) { + w.snapToPage(page); + } } else { mLauncher.getDragController().cancelDrag(); } |