diff options
| author | Adam Powell <adamp@google.com> | 2010-03-04 10:21:02 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-04 10:21:02 -0800 |
| commit | e14dd39b52ecb4a13c9fe93ddd0b3fb7c57c3333 (patch) | |
| tree | ac671ffb3a035de29fe9c8122a5dbc02823040fa /core/java/android | |
| parent | 9d05a18490dfac7ea705a6166f06af77a63c5534 (diff) | |
| parent | 0bba68ddc7e489fd6fb1579417a656f77cbc1ab3 (diff) | |
Merge "Fix VelocityTracker for CTS tests"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/VelocityTracker.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/java/android/view/VelocityTracker.java b/core/java/android/view/VelocityTracker.java index 91fd6f1a509c..c17a724ff041 100644 --- a/core/java/android/view/VelocityTracker.java +++ b/core/java/android/view/VelocityTracker.java @@ -100,6 +100,7 @@ public final class VelocityTracker implements Poolable<VelocityTracker> { } private VelocityTracker() { + clear(); } /** @@ -109,7 +110,7 @@ public final class VelocityTracker implements Poolable<VelocityTracker> { final long[][] pastTime = mPastTime; for (int p = 0; p < MotionEvent.BASE_AVAIL_POINTERS; p++) { for (int i = 0; i < NUM_PAST; i++) { - pastTime[p][i] = 0; + pastTime[p][i] = Long.MIN_VALUE; } } } @@ -129,7 +130,7 @@ public final class VelocityTracker implements Poolable<VelocityTracker> { int touchIndex = (mLastTouch + 1) % NUM_PAST; for (int i=0; i<N; i++) { for (int id = 0; id < MotionEvent.BASE_AVAIL_POINTERS; id++) { - mPastTime[id][touchIndex] = 0; + mPastTime[id][touchIndex] = Long.MIN_VALUE; } for (int p = 0; p < pointerCount; p++) { int id = ev.getPointerId(p); @@ -141,10 +142,10 @@ public final class VelocityTracker implements Poolable<VelocityTracker> { touchIndex = (touchIndex + 1) % NUM_PAST; } - // During calculation any pointer values with a time of 0 are treated - // as a break in input. Initialize all to 0 for each new touch index. + // During calculation any pointer values with a time of MIN_VALUE are treated + // as a break in input. Initialize all to MIN_VALUE for each new touch index. for (int id = 0; id < MotionEvent.BASE_AVAIL_POINTERS; id++) { - mPastTime[id][touchIndex] = 0; + mPastTime[id][touchIndex] = Long.MIN_VALUE; } final long time = ev.getEventTime(); for (int p = 0; p < pointerCount; p++) { @@ -189,7 +190,7 @@ public final class VelocityTracker implements Poolable<VelocityTracker> { // find oldest acceptable time int oldestTouch = lastTouch; - if (pastTime[lastTouch] > 0) { // cleared ? + if (pastTime[lastTouch] != Long.MIN_VALUE) { // cleared ? final float acceptableTime = pastTime[lastTouch] - LONGEST_PAST_TIME; int nextOldestTouch = (NUM_PAST + oldestTouch - 1) % NUM_PAST; while (pastTime[nextOldestTouch] >= acceptableTime && |