aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/proximity_info_state.cpp
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2012-09-24 18:29:31 +0900
committerSatoshi Kataoka <satok@google.com>2012-09-24 21:58:16 +0900
commit0edab9d2fcc30667c79aa9221dbb27f042d8b455 (patch)
tree6268252883d4a462412b98f213b2fd744ac6e516 /native/jni/src/proximity_info_state.cpp
parent8acb881a50c81d4906adc0e6234c99aba8abfa5b (diff)
downloadlatinime-0edab9d2fcc30667c79aa9221dbb27f042d8b455.tar.gz
latinime-0edab9d2fcc30667c79aa9221dbb27f042d8b455.tar.xz
latinime-0edab9d2fcc30667c79aa9221dbb27f042d8b455.zip
Use touch position correction in the geometric input
bug: 7108161 Change-Id: I72d51bcfa26f241bec8fa907d64384e7eebe5c5e
Diffstat (limited to 'native/jni/src/proximity_info_state.cpp')
-rw-r--r--native/jni/src/proximity_info_state.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp
index c5f2884c6..cefe8ab4d 100644
--- a/native/jni/src/proximity_info_state.cpp
+++ b/native/jni/src/proximity_info_state.cpp
@@ -171,7 +171,7 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
const int x = mInputXs[i];
const int y = mInputYs[i];
const float normalizedSquaredDistance =
- mProximityInfo->getNormalizedSquaredDistanceFromCenterFloat(k, x, y);
+ mProximityInfo->getNormalizedSquaredDistanceFromCenterFloatG(k, x, y);
mDistanceCache[index] = normalizedSquaredDistance;
if (normalizedSquaredDistance < NEAR_KEY_NORMALIZED_SQUARED_THRESHOLD) {
mNearKeysVector[i].set(k, 1);
@@ -203,7 +203,7 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
memset(mNormalizedSquaredDistances, NOT_A_DISTANCE, sizeof(mNormalizedSquaredDistances));
memset(mPrimaryInputWord, 0, sizeof(mPrimaryInputWord));
mTouchPositionCorrectionEnabled = mInputSize > 0 && mHasTouchPositionCorrectionData
- && xCoordinates && yCoordinates && !isGeometric;
+ && xCoordinates && yCoordinates;
if (!isGeometric && pointerId == 0) {
for (int i = 0; i < inputSize; ++i) {
mPrimaryInputWord[i] = getPrimaryCharAt(i);
@@ -267,7 +267,7 @@ float ProximityInfoState::updateNearKeysDistances(const int x, const int y,
const int keyCount = mProximityInfo->getKeyCount();
float nearestKeyDistance = mMaxPointToKeyLength;
for (int k = 0; k < keyCount; ++k) {
- const float dist = mProximityInfo->getNormalizedSquaredDistanceFromCenterFloat(k, x, y);
+ const float dist = mProximityInfo->getNormalizedSquaredDistanceFromCenterFloatG(k, x, y);
if (dist < NEAR_KEY_THRESHOLD) {
currentNearKeysDistances->insert(std::pair<int, float>(k, dist));
}