diff options
author | Winson Chung <winsonc@google.com> | 2011-07-29 14:49:10 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-08-02 14:06:55 -0700 |
commit | 1c4cf4a11f3f7f24bbf65f958fdd22295d0bbd55 (patch) | |
tree | 9805fe46eedfe4c1ee7bee5148b60b9ebea98987 /src/com/android/launcher2/SpringLoadedDragController.java | |
parent | ed51cc9a12c50d12e7d30ed209a49f1a40858043 (diff) | |
download | android_packages_apps_Trebuchet-1c4cf4a11f3f7f24bbf65f958fdd22295d0bbd55.tar.gz android_packages_apps_Trebuchet-1c4cf4a11f3f7f24bbf65f958fdd22295d0bbd55.tar.bz2 android_packages_apps_Trebuchet-1c4cf4a11f3f7f24bbf65f958fdd22295d0bbd55.zip |
Minor bug fixes
- Making the spring loaded side page hovers slightly faster
- Fixing issue where you can't drag over another item on another page to create a portal
- Ignoring side pages while hovering over hotseat
- Fixing issue where hotseat may be stuck in shrunken state (and removing the scale on the hotseat)
Change-Id: I87d50a1bdc451704285482c79caed0982a5a7f5a
Diffstat (limited to 'src/com/android/launcher2/SpringLoadedDragController.java')
-rw-r--r-- | src/com/android/launcher2/SpringLoadedDragController.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher2/SpringLoadedDragController.java b/src/com/android/launcher2/SpringLoadedDragController.java index 7b4adf30f..358362c85 100644 --- a/src/com/android/launcher2/SpringLoadedDragController.java +++ b/src/com/android/launcher2/SpringLoadedDragController.java @@ -18,7 +18,8 @@ package com.android.launcher2; public class SpringLoadedDragController implements OnAlarmListener { // how long the user must hover over a mini-screen before it unshrinks - final long ENTER_SPRING_LOAD_HOVER_TIME = 1000; + final long ENTER_SPRING_LOAD_HOVER_TIME = 550; + final long ENTER_SPRING_LOAD_CANCEL_HOVER_TIME = 950; final long EXIT_SPRING_LOAD_HOVER_TIME = 200; Alarm mAlarm; @@ -40,7 +41,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) { mAlarm.cancelAlarm(); - mAlarm.setAlarm(ENTER_SPRING_LOAD_HOVER_TIME); + mAlarm.setAlarm((cl == null) ? ENTER_SPRING_LOAD_CANCEL_HOVER_TIME : + ENTER_SPRING_LOAD_HOVER_TIME); mScreen = cl; } |