diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-01-31 23:24:54 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-01-31 23:24:54 -0800 |
| commit | 6984e7744117e8392a204e1a50e35844aa01fd1e (patch) | |
| tree | 807fcc746e3a3fa1628d05cb23e9a3619a73d8d8 /native/jni/src/proximity_info_state.cpp | |
| parent | 8edb4e6b82bf6904ceab465fb621acf6317764f4 (diff) | |
| parent | de1ec79a357505251c5dad91ebd34ffbcbc03c08 (diff) | |
| download | latinime-6984e7744117e8392a204e1a50e35844aa01fd1e.tar.gz latinime-6984e7744117e8392a204e1a50e35844aa01fd1e.tar.xz latinime-6984e7744117e8392a204e1a50e35844aa01fd1e.zip | |
am de1ec79a: Merge "Cleanup in ProximityInfoStateUtils"
# Via Android (Google) Code Review (1) and Ken Wakasa (1)
* commit 'de1ec79a357505251c5dad91ebd34ffbcbc03c08':
Cleanup in ProximityInfoStateUtils
Diffstat (limited to 'native/jni/src/proximity_info_state.cpp')
| -rw-r--r-- | native/jni/src/proximity_info_state.cpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp index fbdc2c816..4c1ffb30e 100644 --- a/native/jni/src/proximity_info_state.cpp +++ b/native/jni/src/proximity_info_state.cpp @@ -89,29 +89,28 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi } if (xCoordinates && yCoordinates) { - mSampledInputSize = ProximityInfoStateUtils::updateTouchPoints( - mProximityInfo->getMostCommonKeyWidth(), mProximityInfo, mMaxPointToKeyLength, - mInputProximities, xCoordinates, yCoordinates, times, pointerIds, inputSize, - isGeometric, pointerId, pushTouchPointStartIndex, &mSampledInputXs, - &mSampledInputYs, &mSampledTimes, &mSampledLengthCache, &mSampledInputIndice); + mSampledInputSize = ProximityInfoStateUtils::updateTouchPoints(mProximityInfo, + mMaxPointToKeyLength, mInputProximities, xCoordinates, yCoordinates, times, + pointerIds, inputSize, isGeometric, pointerId, pushTouchPointStartIndex, + &mSampledInputXs, &mSampledInputYs, &mSampledTimes, &mSampledLengthCache, + &mSampledInputIndice); } if (mSampledInputSize > 0 && isGeometric) { - mAverageSpeed = ProximityInfoStateUtils::refreshSpeedRates( - inputSize, xCoordinates, yCoordinates, times, lastSavedInputSize, - mSampledInputSize, &mSampledInputXs, &mSampledInputYs, &mSampledTimes, - &mSampledLengthCache, &mSampledInputIndice, &mSpeedRates, &mDirections); - ProximityInfoStateUtils::refreshBeelineSpeedRates( - mProximityInfo->getMostCommonKeyWidth(), mAverageSpeed, inputSize, - xCoordinates, yCoordinates, times, mSampledInputSize, &mSampledInputXs, - &mSampledInputYs, &mSampledInputIndice, &mBeelineSpeedPercentiles); + mAverageSpeed = ProximityInfoStateUtils::refreshSpeedRates(inputSize, xCoordinates, + yCoordinates, times, lastSavedInputSize, mSampledInputSize, &mSampledInputXs, + &mSampledInputYs, &mSampledTimes, &mSampledLengthCache, &mSampledInputIndice, + &mSpeedRates, &mDirections); + ProximityInfoStateUtils::refreshBeelineSpeedRates(mProximityInfo->getMostCommonKeyWidth(), + mAverageSpeed, inputSize, xCoordinates, yCoordinates, times, mSampledInputSize, + &mSampledInputXs, &mSampledInputYs, &mSampledInputIndice, + &mBeelineSpeedPercentiles); } if (mSampledInputSize > 0) { - ProximityInfoStateUtils::initGeometricDistanceInfos( - mProximityInfo, mProximityInfo->getKeyCount(), - mSampledInputSize, lastSavedInputSize, &mSampledInputXs, &mSampledInputYs, - &mSampledNearKeysVector, &mSampledDistanceCache_G); + ProximityInfoStateUtils::initGeometricDistanceInfos(mProximityInfo, mSampledInputSize, + lastSavedInputSize, &mSampledInputXs, &mSampledInputYs, &mSampledNearKeysVector, + &mSampledDistanceCache_G); if (isGeometric) { // updates probabilities of skipping or mapping each key for all points. ProximityInfoStateUtils::updateAlignPointProbabilities( |