summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2011-06-06 20:36:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-06 20:36:49 -0700
commit61220e880ac4d9d76b7fd50744439e68e929c697 (patch)
tree7416218992489a1ddebdafb535d2d65a0dc8cf76 /include
parent55cc25c12c45e8ffb65d2275cc0b6941b68db9df (diff)
parentbbbab26ebe9bc789ba9abac757895a6c31de7cc5 (diff)
downloadframeworks_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 'include')
-rw-r--r--include/ui/Input.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/ui/Input.h b/include/ui/Input.h
index d603441..074b38f 100644
--- a/include/ui/Input.h
+++ b/include/ui/Input.h
@@ -608,11 +608,6 @@ private:
// Oldest sample to consider when calculating the velocity.
static const nsecs_t MAX_AGE = 200 * 1000000; // 200 ms
- // When the total duration of the window of samples being averaged is less
- // than the window size, the resulting velocity is scaled to reduce the impact
- // of overestimation in short traces.
- static const nsecs_t MIN_WINDOW = 100 * 1000000; // 100 ms
-
// The minimum duration between samples when estimating velocity.
static const nsecs_t MIN_DURATION = 10 * 1000000; // 10 ms