diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-09-10 17:13:41 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-09-10 17:13:41 -0700 |
| commit | 9ac49c52883af3408b304ec2bd61fa4c7dff7f90 (patch) | |
| tree | 80bba2368d8ae704733a43252ed57915b510e118 | |
| parent | 591447fd9043db944a180264480db9d6b26c60c0 (diff) | |
| parent | 0d2c0878d4a7e15c69d7e2fe60c806d8dcb7126b (diff) | |
| download | latinime-9ac49c52883af3408b304ec2bd61fa4c7dff7f90.tar.gz latinime-9ac49c52883af3408b304ec2bd61fa4c7dff7f90.tar.xz latinime-9ac49c52883af3408b304ec2bd61fa4c7dff7f90.zip | |
am 0d2c0878: am 8223086e: Merge "Variable type cleanups" into jb-mr1-dev
* commit '0d2c0878d4a7e15c69d7e2fe60c806d8dcb7126b':
Variable type cleanups
| -rw-r--r-- | native/jni/src/proximity_info.cpp | 8 | ||||
| -rw-r--r-- | native/jni/src/proximity_info.h | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp index a8c04300f..9bb8b29ae 100644 --- a/native/jni/src/proximity_info.cpp +++ b/native/jni/src/proximity_info.cpp @@ -275,22 +275,22 @@ void ProximityInfo::initializeG() { } } -float ProximityInfo::getKeyCenterXOfCodePointG(int charCode) const { +int ProximityInfo::getKeyCenterXOfCodePointG(int charCode) const { return getKeyCenterXOfKeyIdG(getKeyIndexOf(charCode)); } -float ProximityInfo::getKeyCenterYOfCodePointG(int charCode) const { +int ProximityInfo::getKeyCenterYOfCodePointG(int charCode) const { return getKeyCenterYOfKeyIdG(getKeyIndexOf(charCode)); } -float ProximityInfo::getKeyCenterXOfKeyIdG(int keyId) const { +int ProximityInfo::getKeyCenterXOfKeyIdG(int keyId) const { if (keyId >= 0) { return mCenterXsG[keyId]; } return 0; } -float ProximityInfo::getKeyCenterYOfKeyIdG(int keyId) const { +int ProximityInfo::getKeyCenterYOfKeyIdG(int keyId) const { if (keyId >= 0) { return mCenterYsG[keyId]; } diff --git a/native/jni/src/proximity_info.h b/native/jni/src/proximity_info.h index 7c22e108b..45df6ff6a 100644 --- a/native/jni/src/proximity_info.h +++ b/native/jni/src/proximity_info.h @@ -104,11 +104,10 @@ class ProximityInfo { return KEYBOARD_HEIGHT; } - // TODO: These should return int. - float getKeyCenterXOfCodePointG(int charCode) const; - float getKeyCenterYOfCodePointG(int charCode) const; - float getKeyCenterXOfKeyIdG(int keyId) const; - float getKeyCenterYOfKeyIdG(int keyId) const; + int getKeyCenterXOfCodePointG(int charCode) const; + int getKeyCenterYOfCodePointG(int charCode) const; + int getKeyCenterXOfKeyIdG(int keyId) const; + int getKeyCenterYOfKeyIdG(int keyId) const; int getKeyKeyDistanceG(int key0, int key1) const; private: |