summaryrefslogtreecommitdiffstats
path: root/include/ui
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2011-06-07 17:52:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-07 17:52:30 -0700
commit5d99f17e827a927938e450076857f4cf145074c2 (patch)
tree83782c70e05463d7dde8924ea545e9c503398211 /include/ui
parent76ad002c32e8075d2df29063ead951bc0e820fb1 (diff)
parentb7edd04f7adc8ed8c0c22a3c6601c22d355fc4da (diff)
downloadframeworks_native-5d99f17e827a927938e450076857f4cf145074c2.zip
frameworks_native-5d99f17e827a927938e450076857f4cf145074c2.tar.gz
frameworks_native-5d99f17e827a927938e450076857f4cf145074c2.tar.bz2
am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2
* commit '61220e880ac4d9d76b7fd50744439e68e929c697': Revert velocity damping. Bug: 4364920
Diffstat (limited to 'include/ui')
-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 3b5aba4..c9f694a 100644
--- a/include/ui/Input.h
+++ b/include/ui/Input.h
@@ -655,11 +655,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