Merge "Reduce the spring effect on All Apps" into sc-dev
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 406e785..41865ce 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -75,9 +75,9 @@
public class AllAppsContainerView extends SpringRelativeLayout implements DragSource,
Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener {
- private static final float FLING_VELOCITY_MULTIPLIER = 1000 * .8f;
+ private static final float FLING_VELOCITY_MULTIPLIER = 1000 * .2f;
// Starts the springs after at least 55% of the animation has passed.
- private static final float FLING_ANIMATION_THRESHOLD = 0.55f;
+ private static final float FLING_ANIMATION_THRESHOLD = 0.25f;
protected final BaseDraggingActivity mLauncher;
protected final AdapterHolder[] mAH;