diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-13 14:56:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-13 14:56:02 -0700 |
| commit | e28776bbd72397eea0dd24f5c28273fb2bf1a2f0 (patch) | |
| tree | b89399e174fa0d02011f98def0cb612d8c1dcc0b /core/java | |
| parent | 5a9cbb291fa7505a6c51eba6f600009dfc17366d (diff) | |
| parent | b1110149cccc3b99e59ead34ca46e5ac026f6db9 (diff) | |
| download | frameworks_base-e28776bbd72397eea0dd24f5c28273fb2bf1a2f0.zip frameworks_base-e28776bbd72397eea0dd24f5c28273fb2bf1a2f0.tar.gz frameworks_base-e28776bbd72397eea0dd24f5c28273fb2bf1a2f0.tar.bz2 | |
am b1110149: merge from open-source master
Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken
* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
Use integer for loop counter instead of float
New test in FrameworkTest for the VelocityTracker class
Preserve '+' in phone numbers imported from SIM.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/VelocityTracker.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/VelocityTracker.java b/core/java/android/view/VelocityTracker.java index aab76c4..e69b807 100644 --- a/core/java/android/view/VelocityTracker.java +++ b/core/java/android/view/VelocityTracker.java @@ -206,7 +206,7 @@ public final class VelocityTracker implements Poolable<VelocityTracker> { final long oldestTime = pastTime[oldestTouch]; float accumX = 0; float accumY = 0; - float N = (lastTouch - oldestTouch + NUM_PAST) % NUM_PAST + 1; + int N = (lastTouch - oldestTouch + NUM_PAST) % NUM_PAST + 1; // Skip the last received event, since it is probably pretty noisy. if (N > 3) N--; |