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

am af01a65f: Merge "Add keyboard hypotenuse metric to ProximityInfo." 

# Via Android (Google) Code Review (1) and Tom Ouyang (1)
* commit 'af01a65f985ca928022ec25172a2c1f4bcad3219':
  Add keyboard hypotenuse metric to ProximityInfo.
main
Tom Ouyang 2013-02-08 18:38:39 -08:00 committed by Android Git Automerger
parent 3d2b9ad1ee af01a65f98
commit 822bac6da3
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@
*/ */
#include <cstring> #include <cstring>
#include <cmath>
#define LOG_TAG "LatinIME: proximity_info.cpp" #define LOG_TAG "LatinIME: proximity_info.cpp"
@ -59,6 +60,7 @@ ProximityInfo::ProximityInfo(JNIEnv *env, const jstring localeJStr,
CELL_HEIGHT((keyboardHeight + gridHeight - 1) / gridHeight), CELL_HEIGHT((keyboardHeight + gridHeight - 1) / gridHeight),
KEY_COUNT(min(keyCount, MAX_KEY_COUNT_IN_A_KEYBOARD)), KEY_COUNT(min(keyCount, MAX_KEY_COUNT_IN_A_KEYBOARD)),
KEYBOARD_WIDTH(keyboardWidth), KEYBOARD_HEIGHT(keyboardHeight), KEYBOARD_WIDTH(keyboardWidth), KEYBOARD_HEIGHT(keyboardHeight),
KEYBOARD_HYPOTENUSE(hypotf(KEYBOARD_WIDTH, KEYBOARD_HEIGHT)),
HAS_TOUCH_POSITION_CORRECTION_DATA(keyCount > 0 && keyXCoordinates && keyYCoordinates HAS_TOUCH_POSITION_CORRECTION_DATA(keyCount > 0 && keyXCoordinates && keyYCoordinates
&& keyWidths && keyHeights && keyCharCodes && sweetSpotCenterXs && keyWidths && keyHeights && keyCharCodes && sweetSpotCenterXs
&& sweetSpotCenterYs && sweetSpotRadii), && sweetSpotCenterYs && sweetSpotRadii),

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

@ -62,6 +62,7 @@ class ProximityInfo {
int getGridHeight() const { return GRID_HEIGHT; } int getGridHeight() const { return GRID_HEIGHT; }
int getKeyboardWidth() const { return KEYBOARD_WIDTH; } int getKeyboardWidth() const { return KEYBOARD_WIDTH; }
int getKeyboardHeight() const { return KEYBOARD_HEIGHT; } int getKeyboardHeight() const { return KEYBOARD_HEIGHT; }
float getKeyboardHypotenuse() const { return KEYBOARD_HYPOTENUSE; }
int getKeyCenterXOfCodePointG(int charCode) const; int getKeyCenterXOfCodePointG(int charCode) const;
int getKeyCenterYOfCodePointG(int charCode) const; int getKeyCenterYOfCodePointG(int charCode) const;
@ -97,6 +98,7 @@ class ProximityInfo {
const int KEY_COUNT; const int KEY_COUNT;
const int KEYBOARD_WIDTH; const int KEYBOARD_WIDTH;
const int KEYBOARD_HEIGHT; const int KEYBOARD_HEIGHT;
const float KEYBOARD_HYPOTENUSE;
const bool HAS_TOUCH_POSITION_CORRECTION_DATA; const bool HAS_TOUCH_POSITION_CORRECTION_DATA;
char mLocaleStr[MAX_LOCALE_STRING_LENGTH]; char mLocaleStr[MAX_LOCALE_STRING_LENGTH];
int *mProximityCharsArray; int *mProximityCharsArray;