aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-10-03 09:28:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-03 09:28:59 +0000
commit13a6a56fe87644b8e56ad8ee88c6395aea0c5d7a (patch)
tree477ff4e2ac4f9ba091f9579a2227e8cf8463b267 /native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
parent3e72459135c91014cf5b9930eaeb2e539400f6f1 (diff)
parentd415747a27514281e9040bcd9c8cb135a0ca2f48 (diff)
downloadlatinime-13a6a56fe87644b8e56ad8ee88c6395aea0c5d7a.tar.gz
latinime-13a6a56fe87644b8e56ad8ee88c6395aea0c5d7a.tar.xz
latinime-13a6a56fe87644b8e56ad8ee88c6395aea0c5d7a.zip
am d415747a: Merge "[ML13] Fix the locale passing in ProximityInfo"
* commit 'd415747a27514281e9040bcd9c8cb135a0ca2f48': [ML13] Fix the locale passing in ProximityInfo
Diffstat (limited to 'native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp')
-rw-r--r--native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
index f88d37ec9..80419b335 100644
--- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
+++ b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp
@@ -25,13 +25,13 @@
namespace latinime {
-static jlong latinime_Keyboard_setProximityInfo(JNIEnv *env, jclass clazz, jstring localeJStr,
+static jlong latinime_Keyboard_setProximityInfo(JNIEnv *env, jclass clazz,
jint displayWidth, jint displayHeight, jint gridWidth, jint gridHeight,
jint mostCommonkeyWidth, jint mostCommonkeyHeight, jintArray proximityChars, jint keyCount,
jintArray keyXCoordinates, jintArray keyYCoordinates, jintArray keyWidths,
jintArray keyHeights, jintArray keyCharCodes, jfloatArray sweetSpotCenterXs,
jfloatArray sweetSpotCenterYs, jfloatArray sweetSpotRadii) {
- ProximityInfo *proximityInfo = new ProximityInfo(env, localeJStr, displayWidth, displayHeight,
+ ProximityInfo *proximityInfo = new ProximityInfo(env, displayWidth, displayHeight,
gridWidth, gridHeight, mostCommonkeyWidth, mostCommonkeyHeight, proximityChars,
keyCount, keyXCoordinates, keyYCoordinates, keyWidths, keyHeights, keyCharCodes,
sweetSpotCenterXs, sweetSpotCenterYs, sweetSpotRadii);
@@ -46,7 +46,7 @@ static void latinime_Keyboard_release(JNIEnv *env, jclass clazz, jlong proximity
static const JNINativeMethod sMethods[] = {
{
const_cast<char *>("setProximityInfoNative"),
- const_cast<char *>("(Ljava/lang/String;IIIIII[II[I[I[I[I[I[F[F[F)J"),
+ const_cast<char *>("(IIIIII[II[I[I[I[I[I[F[F[F)J"),
reinterpret_cast<void *>(latinime_Keyboard_setProximityInfo)
},
{