summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2013-09-06 14:03:41 -0700
committerDaniel Sandler <dsandler@android.com>2013-09-25 14:22:39 -0400
commit33d143abe8a008537cc9b23757539653c6ca07db (patch)
treefc0a55bfe141c64bd01719f30d4785c8096b893d /src/com
parenta0b7e86299ed9baf278e0c1ed73f4a4f6a057322 (diff)
downloadandroid_packages_apps_Trebuchet-33d143abe8a008537cc9b23757539653c6ca07db.tar.gz
android_packages_apps_Trebuchet-33d143abe8a008537cc9b23757539653c6ca07db.tar.bz2
android_packages_apps_Trebuchet-33d143abe8a008537cc9b23757539653c6ca07db.zip
Use the public methods for setting rampup/rampdown time
Starting these at 0; default is 500 Change-Id: I1e097bc72d341bdd0ef73c9e9c43a8c37fe76bf9
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/AutoScrollHelper.java2
-rw-r--r--src/com/android/launcher3/FolderAutoScrollHelper.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/AutoScrollHelper.java b/src/com/android/launcher3/AutoScrollHelper.java
index 3efd80742..e41107cb0 100644
--- a/src/com/android/launcher3/AutoScrollHelper.java
+++ b/src/com/android/launcher3/AutoScrollHelper.java
@@ -67,7 +67,7 @@ import android.view.animation.Interpolator;
* The following scrolling properties may be configured:
* <ul>
* <li>Acceleration ramp-up duration, see {@link #setRampUpDuration}. Default
- * value is 2500 milliseconds.
+ * value is 500 milliseconds.
* <li>Acceleration ramp-down duration, see {@link #setRampDownDuration}.
* Default value is 500 milliseconds.
* <li>Target velocity relative to view size, see {@link #setRelativeVelocity}.
diff --git a/src/com/android/launcher3/FolderAutoScrollHelper.java b/src/com/android/launcher3/FolderAutoScrollHelper.java
index 68edc60c1..3c2b44965 100644
--- a/src/com/android/launcher3/FolderAutoScrollHelper.java
+++ b/src/com/android/launcher3/FolderAutoScrollHelper.java
@@ -36,6 +36,8 @@ public class FolderAutoScrollHelper extends AutoScrollHelper {
setEdgeType(EDGE_TYPE_INSIDE_EXTEND);
setExclusive(true);
setMaximumVelocity(MAX_SCROLL_VELOCITY, MAX_SCROLL_VELOCITY);
+ setRampDownDuration(0);
+ setRampUpDuration(0);
}
@Override