Merge "[HD04] Make the locale mandatory." (b162911f) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ public final class BinaryDictionary extends Dictionary {
		}

		private static native boolean createEmptyDictFileNative(String filePath, long dictVersion,
		String[] attributeKeyStringArray, String[] attributeValueStringArray);
		String locale, String[] attributeKeyStringArray, String[] attributeValueStringArray);
		private static native long openNative(String sourceDir, long dictOffset, long dictSize,
		boolean isUpdatable);
		private static native void getHeaderInfoNative(long dict, int[] outHeaderSize,
		@@ -179,7 +179,7 @@ public final class BinaryDictionary extends Dictionary {
		private static native String getPropertyNative(long dict, String query);

		public static boolean createEmptyDictFile(final String filePath, final long dictVersion,
		final Map<String, String> attributeMap) {
		final Locale locale, final Map<String, String> attributeMap) {
		final String[] keyArray = new String[attributeMap.size()];
		final String[] valueArray = new String[attributeMap.size()];
		int index = 0;
		@@ -188,7 +188,8 @@ public final class BinaryDictionary extends Dictionary {
		valueArray[index] = attributeMap.get(key);
		index++;
		}
		return createEmptyDictFileNative(filePath, dictVersion, keyArray, valueArray);
		return createEmptyDictFileNative(filePath, dictVersion, locale.toString(), keyArray,
		valueArray);
		}

		// TODO: Move native dict into session

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -289,10 +289,10 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		Log.e(TAG, "Can't remove a file: " + file.getName());
		}
		BinaryDictionary.createEmptyDictFile(file.getAbsolutePath(),
		DICTIONARY_FORMAT_VERSION, getHeaderAttributeMap());
		DICTIONARY_FORMAT_VERSION, mLocale, getHeaderAttributeMap());
		mBinaryDictionary = new BinaryDictionary(
		file.getAbsolutePath(), 0 /* offset */, file.length(),
		true /* useFullEditDistance */, null, mDictType, mIsUpdatable);
		true /* useFullEditDistance */, mLocale, mDictType, mIsUpdatable);
		} else {
		mDictionaryWriter.clear();
		}
		@@ -594,7 +594,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		Log.e(TAG, "Can't remove a file: " + file.getName());
		}
		BinaryDictionary.createEmptyDictFile(file.getAbsolutePath(),
		DICTIONARY_FORMAT_VERSION, getHeaderAttributeMap());
		DICTIONARY_FORMAT_VERSION, mLocale, getHeaderAttributeMap());
		} else {
		if (mBinaryDictionary.needsToRunGC(false /* mindsBlockByGC */)) {
		mBinaryDictionary.flushWithGC();

java/src/com/android/inputmethod/latin/makedict/Ver4DictEncoder.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,9 @@ public class Ver4DictEncoder implements DictEncoder {
		throw new UnsupportedFormatException("Given path is not a directory.");
		}
		if (!BinaryDictionary.createEmptyDictFile(mDictPlacedDir.getAbsolutePath(),
		FormatSpec.VERSION4, dict.mOptions.mAttributes)) {
		FormatSpec.VERSION4, LocaleUtils.constructLocaleFromString(
		dict.mOptions.mAttributes.get(DictionaryHeader.DICTIONARY_LOCALE_KEY)),
		dict.mOptions.mAttributes)) {
		throw new IOException("Cannot create dictionary file : "
		+ mDictPlacedDir.getAbsolutePath());
		}

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+8 −4

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		#include "suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h"
		#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
		#include "utils/autocorrection_threshold_utils.h"
		#include "utils/char_utils.h"
		#include "utils/time_keeper.h"

		namespace latinime {
		@@ -37,13 +38,15 @@ class ProximityInfo;

		// TODO: Move to makedict.
		static jboolean latinime_BinaryDictionary_createEmptyDictFile(JNIEnv *env, jclass clazz,
		jstring filePath, jlong dictVersion, jobjectArray attributeKeyStringArray,
		jstring filePath, jlong dictVersion, jstring locale, jobjectArray attributeKeyStringArray,
		jobjectArray attributeValueStringArray) {
		const jsize filePathUtf8Length = env->GetStringUTFLength(filePath);
		char filePathChars[filePathUtf8Length + 1];
		env->GetStringUTFRegion(filePath, 0, env->GetStringLength(filePath), filePathChars);
		filePathChars[filePathUtf8Length] = '\0';

		jsize localeLength = env->GetStringLength(locale);
		jchar localeCodePoints[localeLength];
		env->GetStringRegion(locale, 0, localeLength, localeCodePoints);
		const int keyCount = env->GetArrayLength(attributeKeyStringArray);
		const int valueCount = env->GetArrayLength(attributeValueStringArray);
		if (keyCount != valueCount) {
		@@ -73,7 +76,7 @@ static jboolean latinime_BinaryDictionary_createEmptyDictFile(JNIEnv *env, jclas
		}

		return DictFileWritingUtils::createEmptyDictFile(filePathChars, static_cast<int>(dictVersion),
		&attributeMap);
		CharUtils::convertShortArrayToIntVector(localeCodePoints, localeLength), &attributeMap);
		}

		static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring sourceDir,
		@@ -503,7 +506,8 @@ static int latinime_BinaryDictionary_setCurrentTimeForTest(JNIEnv *env, jclass c
		static const JNINativeMethod sMethods[] = {
		{
		const_cast<char *>("createEmptyDictFileNative"),
		const_cast<char *>("(Ljava/lang/String;J[Ljava/lang/String;[Ljava/lang/String;)Z"),
		const_cast<char *>(
		"(Ljava/lang/String;JLjava/lang/String;[Ljava/lang/String;[Ljava/lang/String;)Z"),
		reinterpret_cast<void *>(latinime_BinaryDictionary_createEmptyDictFile)
		},
		{

native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ const char *const HeaderPolicy::EXTENDED_REGION_SIZE_KEY = "EXTENDED_REGION_SIZE
		// Historical info is information that is needed to support decaying such as timestamp, level and
		// count.
		const char *const HeaderPolicy::HAS_HISTORICAL_INFO_KEY = "HAS_HISTORICAL_INFO";
		const char *const HeaderPolicy::LOCALE_KEY = "locale"; // match Java declaration
		const int HeaderPolicy::DEFAULT_MULTIPLE_WORDS_DEMOTION_RATE = 100;
		const float HeaderPolicy::MULTIPLE_WORD_COST_MULTIPLIER_SCALE = 100.0f;

		@@ -59,6 +60,10 @@ void HeaderPolicy::readHeaderValueOrQuestionMark(const char const key, int out
		outValue[terminalIndex] = '\0';
		}

		const std::vector<int> HeaderPolicy::readLocale() const {
		return HeaderReadWriteUtils::readCodePointVectorAttributeValue(&mAttributeMap, LOCALE_KEY);
		}

		float HeaderPolicy::readMultipleWordCostMultiplier() const {
		const int demotionRate = HeaderReadWriteUtils::readIntAttributeValue(&mAttributeMap,
		MULTIPLE_WORDS_DEMOTION_RATE_KEY, DEFAULT_MULTIPLE_WORDS_DEMOTION_RATE);
		@@ -116,6 +121,7 @@ void HeaderPolicy::fillInHeader(const bool updatesLastDecayedTime, const int uni
		// Set the current time as the generation time.
		HeaderReadWriteUtils::setIntAttribute(outAttributeMap, DATE_KEY,
		TimeKeeper::peekCurrentTime());
		HeaderReadWriteUtils::setCodePointVectorAttribute(outAttributeMap, LOCALE_KEY, mLocale);
		if (updatesLastDecayedTime) {
		// Set current time as the last updated time.
		HeaderReadWriteUtils::setIntAttribute(outAttributeMap, LAST_DECAYED_TIME_KEY,