diff options
| author |   Keisuke Kuroynagi <ksk@google.com> | 2013-04-17 19:38:38 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-17 19:38:38 -0700 |
| commit | 5c7c36e31f609dbaba4a04bbeff2b273b9ee16fc (patch) | |
| tree | 911627792afcb9513d7c5462aa777e1de7f0167f /native/jni/src/proximity_info.cpp | |
| parent | 6f6edd76f82cc229441b9fcd4111ad49f72b0a6e (diff) | |
| parent | e81c16788712590fd6cf9e14420d50acf029ad48 (diff) | |
| download | latinime-5c7c36e31f609dbaba4a04bbeff2b273b9ee16fc.tar.gz latinime-5c7c36e31f609dbaba4a04bbeff2b273b9ee16fc.tar.xz latinime-5c7c36e31f609dbaba4a04bbeff2b273b9ee16fc.zip | |
am e81c1678: am 87fdde6e: Typing double letters via a \'circle\' on the key.
* commit 'e81c16788712590fd6cf9e14420d50acf029ad48':
Typing double letters via a 'circle' on the key.
Diffstat (limited to 'native/jni/src/proximity_info.cpp')
| -rw-r--r-- | native/jni/src/proximity_info.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp index 50f38e82e..88d670d61 100644 --- a/native/jni/src/proximity_info.cpp +++ b/native/jni/src/proximity_info.cpp @@ -49,13 +49,17 @@ static AK_FORCE_INLINE void safeGetOrFillZeroFloatArrayRegion(JNIEnv *env, jfloa ProximityInfo::ProximityInfo(JNIEnv *env, const jstring localeJStr, const int keyboardWidth, const int keyboardHeight, const int gridWidth, - const int gridHeight, const int mostCommonKeyWidth, const jintArray proximityChars, - const int keyCount, const jintArray keyXCoordinates, const jintArray keyYCoordinates, - const jintArray keyWidths, const jintArray keyHeights, const jintArray keyCharCodes, - const jfloatArray sweetSpotCenterXs, const jfloatArray sweetSpotCenterYs, - const jfloatArray sweetSpotRadii) + const int gridHeight, const int mostCommonKeyWidth, const int mostCommonKeyHeight, + const jintArray proximityChars, const int keyCount, const jintArray keyXCoordinates, + const jintArray keyYCoordinates, const jintArray keyWidths, const jintArray keyHeights, + const jintArray keyCharCodes, const jfloatArray sweetSpotCenterXs, + const jfloatArray sweetSpotCenterYs, const jfloatArray sweetSpotRadii) : GRID_WIDTH(gridWidth), GRID_HEIGHT(gridHeight), MOST_COMMON_KEY_WIDTH(mostCommonKeyWidth), MOST_COMMON_KEY_WIDTH_SQUARE(mostCommonKeyWidth * mostCommonKeyWidth), + MOST_COMMON_KEY_HEIGHT(mostCommonKeyHeight), + NORMALIZED_SQUARED_MOST_COMMON_KEY_HYPOTENUSE(1.0f + + SQUARE_FLOAT(static_cast<float>(mostCommonKeyHeight) / + static_cast<float>(mostCommonKeyWidth))), CELL_WIDTH((keyboardWidth + gridWidth - 1) / gridWidth), CELL_HEIGHT((keyboardHeight + gridHeight - 1) / gridHeight), KEY_COUNT(min(keyCount, MAX_KEY_COUNT_IN_A_KEYBOARD)), |