diff options
| author |   Tom Ouyang <ouyang@google.com> | 2013-02-08 18:38:39 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-02-08 18:38:39 -0800 |
| commit | 822bac6da37409ee0f94ecbadf1c0935f7390d78 (patch) | |
| tree | 4758e74204c30cc9c68f7fb51db91566b64e3f08 /native/jni/src/proximity_info.cpp | |
| parent | 3d2b9ad1ee814c5ae5dea05a31276726192d6b2b (diff) | |
| parent | af01a65f985ca928022ec25172a2c1f4bcad3219 (diff) | |
| download | latinime-822bac6da37409ee0f94ecbadf1c0935f7390d78.tar.gz latinime-822bac6da37409ee0f94ecbadf1c0935f7390d78.tar.xz latinime-822bac6da37409ee0f94ecbadf1c0935f7390d78.zip | |
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.
Diffstat (limited to 'native/jni/src/proximity_info.cpp')
| -rw-r--r-- | native/jni/src/proximity_info.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp index d812745ca..81eb0b37d 100644 --- a/native/jni/src/proximity_info.cpp +++ b/native/jni/src/proximity_info.cpp @@ -15,6 +15,7 @@ */ #include <cstring> +#include <cmath> #define LOG_TAG "LatinIME: proximity_info.cpp" @@ -59,6 +60,7 @@ ProximityInfo::ProximityInfo(JNIEnv *env, const jstring localeJStr, CELL_HEIGHT((keyboardHeight + gridHeight - 1) / gridHeight), KEY_COUNT(min(keyCount, MAX_KEY_COUNT_IN_A_KEYBOARD)), KEYBOARD_WIDTH(keyboardWidth), KEYBOARD_HEIGHT(keyboardHeight), + KEYBOARD_HYPOTENUSE(hypotf(KEYBOARD_WIDTH, KEYBOARD_HEIGHT)), HAS_TOUCH_POSITION_CORRECTION_DATA(keyCount > 0 && keyXCoordinates && keyYCoordinates && keyWidths && keyHeights && keyCharCodes && sweetSpotCenterXs && sweetSpotCenterYs && sweetSpotRadii), |