diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-09-04 01:23:19 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-09-04 01:23:19 -0700 |
| commit | d78a832c6d22b219e2439a6198a759843c635074 (patch) | |
| tree | fb57d8b653999a2ef704bdb5729e93e4248a1f8b /native/jni/src/proximity_info.cpp | |
| parent | 6fa6e1c96ddbb8a0ac3849664acc3d07eb4908b7 (diff) | |
| parent | 2ecf6254a7e21ab33995ed7cb07c2b8a4f825038 (diff) | |
| download | latinime-d78a832c6d22b219e2439a6198a759843c635074.tar.gz latinime-d78a832c6d22b219e2439a6198a759843c635074.tar.xz latinime-d78a832c6d22b219e2439a6198a759843c635074.zip | |
am 2ecf6254: Merge "Restricting children for gesture input." into jb-mr1-dev
* commit '2ecf6254a7e21ab33995ed7cb07c2b8a4f825038':
Restricting children for gesture input.
Diffstat (limited to 'native/jni/src/proximity_info.cpp')
| -rw-r--r-- | native/jni/src/proximity_info.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp index 737172693..a8c04300f 100644 --- a/native/jni/src/proximity_info.cpp +++ b/native/jni/src/proximity_info.cpp @@ -62,6 +62,7 @@ ProximityInfo::ProximityInfo(JNIEnv *env, const jstring localeJStr, const int ma CELL_WIDTH((keyboardWidth + gridWidth - 1) / gridWidth), CELL_HEIGHT((keyboardHeight + gridHeight - 1) / gridHeight), KEY_COUNT(min(keyCount, MAX_KEY_COUNT_IN_A_KEYBOARD)), + KEYBOARD_WIDTH(keyboardWidth), KEYBOARD_HEIGHT(keyboardHeight), HAS_TOUCH_POSITION_CORRECTION_DATA(keyCount > 0 && keyXCoordinates && keyYCoordinates && keyWidths && keyHeights && keyCharCodes && sweetSpotCenterXs && sweetSpotCenterYs && sweetSpotRadii), |