diff options
| author | Jeff Brown <jeffbrown@android.com> | 2011-06-06 20:36:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-06 20:36:49 -0700 |
| commit | 61220e880ac4d9d76b7fd50744439e68e929c697 (patch) | |
| tree | 7416218992489a1ddebdafb535d2d65a0dc8cf76 /libs | |
| parent | 55cc25c12c45e8ffb65d2275cc0b6941b68db9df (diff) | |
| parent | bbbab26ebe9bc789ba9abac757895a6c31de7cc5 (diff) | |
| download | frameworks_base-61220e880ac4d9d76b7fd50744439e68e929c697.zip frameworks_base-61220e880ac4d9d76b7fd50744439e68e929c697.tar.gz frameworks_base-61220e880ac4d9d76b7fd50744439e68e929c697.tar.bz2 | |
am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2
* commit 'bbbab26ebe9bc789ba9abac757895a6c31de7cc5':
Revert velocity damping. Bug: 4364920
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ui/Input.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libs/ui/Input.cpp b/libs/ui/Input.cpp index 50b75d5..1fc46aa 100644 --- a/libs/ui/Input.cpp +++ b/libs/ui/Input.cpp @@ -677,7 +677,6 @@ bool MotionEvent::isTouchEvent(int32_t source, int32_t action) { const uint32_t VelocityTracker::HISTORY_SIZE; const nsecs_t VelocityTracker::MAX_AGE; -const nsecs_t VelocityTracker::MIN_WINDOW; const nsecs_t VelocityTracker::MIN_DURATION; VelocityTracker::VelocityTracker() { @@ -868,14 +867,6 @@ bool VelocityTracker::getVelocity(uint32_t id, float* outVx, float* outVy) const // Make sure we used at least one sample. if (samplesUsed != 0) { - // Scale the velocity linearly if the window of samples is small. - nsecs_t totalDuration = newestMovement.eventTime - oldestMovement.eventTime; - if (totalDuration < MIN_WINDOW) { - float scale = float(totalDuration) / float(MIN_WINDOW); - accumVx *= scale; - accumVy *= scale; - } - *outVx = accumVx; *outVy = accumVy; return true; |