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
This commit is contained in:
Winson Chung
2011-07-29 14:49:10 -07:00
parent ed51cc9a12
commit 1c4cf4a11f
4 changed files with 27 additions and 25 deletions

View File

@@ -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;
}