am 358f3caa: am 4d75fe9b: FIX: Wrong way to gesture speed calculation.

* commit '358f3caa9afd5c90abc1930986e0a2216396f2a0':
  FIX: Wrong way to gesture speed calculation.
main
Keisuke Kuroyanagi 2012-09-24 21:10:35 -07:00 committed by Android Git Automerger
commit 67b211fee2
1 changed files with 4 additions and 2 deletions

View File

@ -179,7 +179,9 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
duration = times[index] - times[index - 1]; duration = times[index] - times[index - 1];
} else if (0 < index && index < inputSize - 1) { } else if (0 < index && index < inputSize - 1) {
length = getDistanceInt(xCoordinates[index - 1], yCoordinates[index - 1], length = getDistanceInt(xCoordinates[index - 1], yCoordinates[index - 1],
xCoordinates[index + 1], yCoordinates[index + 1]); xCoordinates[index], yCoordinates[index])
+ getDistanceInt(xCoordinates[index], yCoordinates[index],
xCoordinates[index + 1], yCoordinates[index + 1]);
duration = times[index + 1] - times[index - 1]; duration = times[index + 1] - times[index - 1];
} else { } else {
length = 0; length = 0;
@ -509,7 +511,7 @@ float ProximityInfoState::getPointToKeyLength(const int inputIndex, const int co
return min(mDistanceCache[index] * scale, mMaxPointToKeyLength); return min(mDistanceCache[index] * scale, mMaxPointToKeyLength);
} }
if (isSkippableChar(codePoint)) { if (isSkippableChar(codePoint)) {
return 0; return 0.0f;
} }
// If the char is not a key on the keyboard then return the max length. // If the char is not a key on the keyboard then return the max length.
return MAX_POINT_TO_KEY_LENGTH; return MAX_POINT_TO_KEY_LENGTH;