summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/SmoothPagedView.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher3/SmoothPagedView.java')
-rw-r--r--src/com/android/launcher3/SmoothPagedView.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/launcher3/SmoothPagedView.java b/src/com/android/launcher3/SmoothPagedView.java
index a45dbbf6e..4e331aa2c 100644
--- a/src/com/android/launcher3/SmoothPagedView.java
+++ b/src/com/android/launcher3/SmoothPagedView.java
@@ -19,7 +19,6 @@ package com.android.launcher3;
import android.content.Context;
import android.util.AttributeSet;
import android.view.animation.Interpolator;
-import android.widget.Scroller;
public abstract class SmoothPagedView extends PagedView {
private static final float SMOOTHING_SPEED = 0.75f;
@@ -52,8 +51,6 @@ public abstract class SmoothPagedView extends PagedView {
}
public float getInterpolation(float t) {
- // _o(t) = t * t * ((tension + 1) * t + tension)
- // o(t) = _o(t - 1) + 1
t -= 1.0f;
return t * t * ((mTension + 1) * t + mTension) + 1.0f;
}
@@ -102,7 +99,7 @@ public abstract class SmoothPagedView extends PagedView {
mBaseLineFlingVelocity = 2500.0f;
mFlingVelocityInfluence = 0.4f;
mScrollInterpolator = new OvershootInterpolator();
- mScroller = new Scroller(getContext(), mScrollInterpolator);
+ setDefaultInterpolator(mScrollInterpolator);
}
}