aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/proximity_info.cpp
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2012-09-04 01:25:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-04 01:25:37 -0700
commite6c122b4dea6579a3865f5fadfa7448b556d3190 (patch)
treefb57d8b653999a2ef704bdb5729e93e4248a1f8b /native/jni/src/proximity_info.cpp
parentf03590b3d33c4f5e12c27a54dc7b147a3a4e8f5d (diff)
parentd78a832c6d22b219e2439a6198a759843c635074 (diff)
downloadlatinime-e6c122b4dea6579a3865f5fadfa7448b556d3190.tar.gz
latinime-e6c122b4dea6579a3865f5fadfa7448b556d3190.tar.xz
latinime-e6c122b4dea6579a3865f5fadfa7448b556d3190.zip
am d78a832c: am 2ecf6254: Merge "Restricting children for gesture input." into jb-mr1-dev
* commit 'd78a832c6d22b219e2439a6198a759843c635074': Restricting children for gesture input.
Diffstat (limited to 'native/jni/src/proximity_info.cpp')
-rw-r--r--native/jni/src/proximity_info.cpp1
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),