diff options
-rw-r--r-- | src/com/android/launcher3/AutoScrollHelper.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/FolderAutoScrollHelper.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/AutoScrollHelper.java b/src/com/android/launcher3/AutoScrollHelper.java index 9a7c3b0f0..3efd80742 100644 --- a/src/com/android/launcher3/AutoScrollHelper.java +++ b/src/com/android/launcher3/AutoScrollHelper.java @@ -192,7 +192,7 @@ public abstract class AutoScrollHelper implements View.OnTouchListener { private static final float DEFAULT_RELATIVE_EDGE = 0.2f; private static final float DEFAULT_RELATIVE_VELOCITY = 1f; private static final int DEFAULT_ACTIVATION_DELAY = ViewConfiguration.getTapTimeout(); - private static final int DEFAULT_RAMP_UP_DURATION = 2500; + private static final int DEFAULT_RAMP_UP_DURATION = 500; private static final int DEFAULT_RAMP_DOWN_DURATION = 500; /** diff --git a/src/com/android/launcher3/FolderAutoScrollHelper.java b/src/com/android/launcher3/FolderAutoScrollHelper.java index d7e677053..68edc60c1 100644 --- a/src/com/android/launcher3/FolderAutoScrollHelper.java +++ b/src/com/android/launcher3/FolderAutoScrollHelper.java @@ -33,7 +33,7 @@ public class FolderAutoScrollHelper extends AutoScrollHelper { mTarget = target; setActivationDelay(0); - setEdgeType(EDGE_TYPE_INSIDE); + setEdgeType(EDGE_TYPE_INSIDE_EXTEND); setExclusive(true); setMaximumVelocity(MAX_SCROLL_VELOCITY, MAX_SCROLL_VELOCITY); } |