Merge "Extend jni interface to input/output languageWeight." (35314af0) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/BinaryDictionary.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ public final class BinaryDictionary extends Dictionary {
		private final int[] mOutputTypes = new int[MAX_RESULTS];
		// Only one result is ever used
		private final int[] mOutputAutoCommitFirstWordConfidence = new int[1];
		private final float[] mInputOutputLanguageWeight = new float[1];

		private final NativeSuggestOptions mNativeSuggestOptions = new NativeSuggestOptions();

		@@ -167,7 +168,7 @@ public final class BinaryDictionary extends Dictionary {
		int[] pointerIds, int[] inputCodePoints, int inputSize, int[] suggestOptions,
		int[] prevWordCodePointArray, int[] outputSuggestionCount, int[] outputCodePoints,
		int[] outputScores, int[] outputIndices, int[] outputTypes,
		int[] outputAutoCommitFirstWordConfidence);
		int[] outputAutoCommitFirstWordConfidence, float[] inOutLanguageWeight);
		private static native void addUnigramWordNative(long dict, int[] word, int probability,
		int[] shortcutTarget, int shortcutProbability, boolean isNotAWord,
		boolean isBlacklisted, int timestamp);
		@@ -262,13 +263,22 @@ public final class BinaryDictionary extends Dictionary {
		final int inputSize = isGesture ? ips.getPointerSize() : composerSize;
		mNativeSuggestOptions.setIsGesture(isGesture);
		mNativeSuggestOptions.setAdditionalFeaturesOptions(additionalFeaturesOptions);
		if (inOutLanguageWeight != null) {
		mInputOutputLanguageWeight[0] = inOutLanguageWeight[0];
		} else {
		mInputOutputLanguageWeight[0] = Dictionary.NOT_A_LANGUAGE_WEIGHT;
		}
		// proximityInfo and/or prevWordForBigrams may not be null.
		getSuggestionsNative(mNativeDict, proximityInfo.getNativeProximityInfo(),
		getTraverseSession(sessionId).getSession(), ips.getXCoordinates(),
		ips.getYCoordinates(), ips.getTimes(), ips.getPointerIds(), mInputCodePoints,
		inputSize, mNativeSuggestOptions.getOptions(),
		prevWordCodePointArray, mOutputSuggestionCount, mOutputCodePoints, mOutputScores,
		mSpaceIndices, mOutputTypes, mOutputAutoCommitFirstWordConfidence);
		mSpaceIndices, mOutputTypes, mOutputAutoCommitFirstWordConfidence,
		mInputOutputLanguageWeight);
		if (inOutLanguageWeight != null) {
		inOutLanguageWeight[0] = mInputOutputLanguageWeight[0];
		}
		final int count = mOutputSuggestionCount[0];
		final ArrayList<SuggestedWordInfo> suggestions = CollectionUtils.newArrayList();
		for (int j = 0; j < count; ++j) {

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -146,7 +146,8 @@ static void latinime_BinaryDictionary_getSuggestions(JNIEnv *env, jclass clazz,
		jintArray inputCodePointsArray, jint inputSize, jintArray suggestOptions,
		jintArray prevWordCodePointsForBigrams, jintArray outSuggestionCount,
		jintArray outCodePointsArray, jintArray outScoresArray, jintArray outSpaceIndicesArray,
		jintArray outTypesArray, jintArray outAutoCommitFirstWordConfidenceArray) {
		jintArray outTypesArray, jintArray outAutoCommitFirstWordConfidenceArray,
		jfloatArray inOutLanguageWeight) {
		Dictionary dictionary = reinterpret_cast<Dictionary >(dict);
		// Assign 0 to outSuggestionCount here in case of returning earlier in this method.
		int count = 0;
		@@ -489,7 +490,7 @@ static const JNINativeMethod sMethods[] = {
		},
		{
		const_cast<char *>("getSuggestionsNative"),
		const_cast<char *>("(JJJ[I[I[I[I[II[I[I[I[I[I[I[I[I)V"),
		const_cast<char *>("(JJJ[I[I[I[I[II[I[I[I[I[I[I[I[I[F)V"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_getSuggestions)
		},
		{