diff options
| author | Mindy Pereira <mindyp@google.com> | 2013-09-04 14:32:02 -0700 |
|---|---|---|
| committer | Mindy Pereira <mindyp@google.com> | 2013-09-04 14:32:02 -0700 |
| commit | e886ee1900437da92e8e6ea93b44fd5472b9e996 (patch) | |
| tree | d83a6503aa9d7fe5644a4a3f9ff4afeacc134247 /src | |
| parent | 60e01b610a3247c87384e403697aa332d0d3a1f5 (diff) | |
| download | android_packages_apps_Trebuchet-e886ee1900437da92e8e6ea93b44fd5472b9e996.tar.gz android_packages_apps_Trebuchet-e886ee1900437da92e8e6ea93b44fd5472b9e996.tar.bz2 android_packages_apps_Trebuchet-e886ee1900437da92e8e6ea93b44fd5472b9e996.zip | |
Faster ramp up; external area continues the scrolling
Change-Id: I5e0c5803fac9b92721f21a5f799a6929c49bb885
Diffstat (limited to 'src')
| -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); } |