diff options
author | nebkat <nebkat@gmail.com> | 2011-12-25 15:27:50 +0000 |
---|---|---|
committer | nebkat <nebkat@gmail.com> | 2011-12-27 11:10:08 +0000 |
commit | ca5a6d536e46ed875beaf27ff4a46aba4940ba6b (patch) | |
tree | a2c1b0524fc011cff31e3c1540deda801667e261 /src/com | |
parent | c1d7bc76c7f214ce713d196b973f90925df62331 (diff) | |
download | android_packages_apps_Trebuchet-ca5a6d536e46ed875beaf27ff4a46aba4940ba6b.tar.gz android_packages_apps_Trebuchet-ca5a6d536e46ed875beaf27ff4a46aba4940ba6b.tar.bz2 android_packages_apps_Trebuchet-ca5a6d536e46ed875beaf27ff4a46aba4940ba6b.zip |
Workspace: Disable Touch Smoothing
Touch smoothing is a feature to average out the touches to make
scrolling seem smooth. But this smoothing gives the effect that
there is lag.
Change-Id: Iafd3158dc8a3e9acd086b088141a64a316bf064d
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/cyanogenmod/trebuchet/PagedView.java | 5 | ||||
-rw-r--r-- | src/com/cyanogenmod/trebuchet/SmoothPagedView.java | 9 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/com/cyanogenmod/trebuchet/PagedView.java b/src/com/cyanogenmod/trebuchet/PagedView.java index 723ce3015..667a9543a 100644 --- a/src/com/cyanogenmod/trebuchet/PagedView.java +++ b/src/com/cyanogenmod/trebuchet/PagedView.java @@ -63,7 +63,6 @@ public abstract class PagedView extends ViewGroup { private static final int MIN_LENGTH_FOR_FLING = 25; private static final int PAGE_SNAP_ANIMATION_DURATION = 550; - protected static final float NANOTIME_DIV = 1000000000.0f; private static final float OVERSCROLL_ACCELERATE_FACTOR = 2; private static final float OVERSCROLL_DAMP_FACTOR = 0.14f; @@ -77,7 +76,6 @@ public abstract class PagedView extends ViewGroup { protected int mSnapVelocity = 500; protected float mDensity; - protected float mSmoothingTime; protected float mTouchX; protected boolean mFirstLayout = true; @@ -391,7 +389,6 @@ public abstract class PagedView extends ViewGroup { } mTouchX = x; - mSmoothingTime = System.nanoTime() / NANOTIME_DIV; } // we moved this functionality to a helper function so SmoothPagedView can reuse it @@ -1033,7 +1030,6 @@ public abstract class PagedView extends ViewGroup { mLastMotionX = x; mLastMotionXRemainder = 0; mTouchX = mScrollX; - mSmoothingTime = System.nanoTime() / NANOTIME_DIV; pageBeginMoving(); } // Either way, cancel any pending longpress @@ -1179,7 +1175,6 @@ public abstract class PagedView extends ViewGroup { // scrolled position (which is discrete). if (Math.abs(deltaX) >= 1.0f) { mTouchX += deltaX; - mSmoothingTime = System.nanoTime() / NANOTIME_DIV; if (!mDeferScrollUpdate) { scrollBy((int) deltaX, 0); if (DEBUG) Log.d(TAG, "onTouchEvent().Scrolling: " + deltaX); diff --git a/src/com/cyanogenmod/trebuchet/SmoothPagedView.java b/src/com/cyanogenmod/trebuchet/SmoothPagedView.java index 52695637a..991cc0e65 100644 --- a/src/com/cyanogenmod/trebuchet/SmoothPagedView.java +++ b/src/com/cyanogenmod/trebuchet/SmoothPagedView.java @@ -22,9 +22,6 @@ import android.view.animation.Interpolator; import android.widget.Scroller; public abstract class SmoothPagedView extends PagedView { - private static final float SMOOTHING_SPEED = 0.75f; - private static final float SMOOTHING_CONSTANT = (float) (0.016 / Math.log(SMOOTHING_SPEED)); - private float mBaseLineFlingVelocity; private float mFlingVelocityInfluence; @@ -171,12 +168,8 @@ public abstract class SmoothPagedView extends PagedView { boolean scrollComputed = computeScrollHelper(); if (!scrollComputed && mTouchState == TOUCH_STATE_SCROLLING) { - final float now = System.nanoTime() / NANOTIME_DIV; - final float e = (float) Math.exp((now - mSmoothingTime) / SMOOTHING_CONSTANT); - final float dx = mTouchX - mUnboundedScrollX; - scrollTo(Math.round(mUnboundedScrollX + dx * e), mScrollY); - mSmoothingTime = now; + scrollTo(Math.round(mUnboundedScrollX + dx), mScrollY); // Keep generating points as long as we're more than 1px away from the target if (dx > 1.f || dx < -1.f) { |