nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 0d2c0878: am 8223086e: Merge "Variable type cleanups" into jb-mr1-dev 

* commit '0d2c0878d4a7e15c69d7e2fe60c806d8dcb7126b':
  Variable type cleanups
main
Ken Wakasa 2012-09-10 17:13:41 -07:00 committed by Android Git Automerger
parent 591447fd90 0d2c0878d4
commit 9ac49c5288
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/jni/src/proximity_info.cpp
View File

@ -275,22 +275,22 @@ void ProximityInfo::initializeG() {
} }
} }
float ProximityInfo::getKeyCenterXOfCodePointG(int charCode) const { int ProximityInfo::getKeyCenterXOfCodePointG(int charCode) const {
return getKeyCenterXOfKeyIdG(getKeyIndexOf(charCode)); return getKeyCenterXOfKeyIdG(getKeyIndexOf(charCode));
} }
float ProximityInfo::getKeyCenterYOfCodePointG(int charCode) const { int ProximityInfo::getKeyCenterYOfCodePointG(int charCode) const {
return getKeyCenterYOfKeyIdG(getKeyIndexOf(charCode)); return getKeyCenterYOfKeyIdG(getKeyIndexOf(charCode));
} }
float ProximityInfo::getKeyCenterXOfKeyIdG(int keyId) const { int ProximityInfo::getKeyCenterXOfKeyIdG(int keyId) const {
if (keyId >= 0) { if (keyId >= 0) {
return mCenterXsG[keyId]; return mCenterXsG[keyId];
} }
return 0; return 0;
} }
float ProximityInfo::getKeyCenterYOfKeyIdG(int keyId) const { int ProximityInfo::getKeyCenterYOfKeyIdG(int keyId) const {
if (keyId >= 0) { if (keyId >= 0) {
return mCenterYsG[keyId]; return mCenterYsG[keyId];
} }

9
native/jni/src/proximity_info.h
View File

@ -104,11 +104,10 @@ class ProximityInfo {
return KEYBOARD_HEIGHT; return KEYBOARD_HEIGHT;
} }
// TODO: These should return int. int getKeyCenterXOfCodePointG(int charCode) const;
float getKeyCenterXOfCodePointG(int charCode) const; int getKeyCenterYOfCodePointG(int charCode) const;
float getKeyCenterYOfCodePointG(int charCode) const; int getKeyCenterXOfKeyIdG(int keyId) const;
float getKeyCenterXOfKeyIdG(int keyId) const; int getKeyCenterYOfKeyIdG(int keyId) const;
float getKeyCenterYOfKeyIdG(int keyId) const;
int getKeyKeyDistanceG(int key0, int key1) const; int getKeyKeyDistanceG(int key0, int key1) const;
private: private: