Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9a8f2a8 authored Jul 28, 2014 by Keisuke Kuroyanagi

Allow adding DICTIONARY_MAX_WORD_LENGTH-length words.

Bug: 12725817
Change-Id: Ib9b30473ba94242a7b97ccd3b850068f596a5d17

parent 3225b6fe

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
		// Don't add single letter words, possibly confuses
		// capitalization of i.
		final int wordLen = StringUtils.codePointCount(word);
		if (wordLen < MAX_WORD_LENGTH && wordLen > 1) {
		if (wordLen <= MAX_WORD_LENGTH && wordLen > 1) {
		if (DEBUG) {
		Log.d(TAG, "addName " + name + ", " + word + ", " + prevWordsInfo);
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -253,12 +253,12 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
		final int frequency = cursor.getInt(indexFrequency);
		final int adjustedFrequency = scaleFrequencyFromDefaultToLatinIme(frequency);
		// Safeguard against adding really long words.
		if (word.length() < MAX_WORD_LENGTH) {
		if (word.length() <= MAX_WORD_LENGTH) {
		runGCIfRequiredLocked(true /* mindsBlockByGC */);
		addUnigramLocked(word, adjustedFrequency, null /* shortcutTarget */,
		0 /* shortcutFreq /, false / isNotAWord */,
		false /* isBlacklisted */, BinaryDictionary.NOT_A_VALID_TIMESTAMP);
		if (null != shortcut && shortcut.length() < MAX_WORD_LENGTH) {
		if (null != shortcut && shortcut.length() <= MAX_WORD_LENGTH) {
		runGCIfRequiredLocked(true /* mindsBlockByGC */);
		addUnigramLocked(shortcut, adjustedFrequency, word,
		USER_DICT_SHORTCUT_FREQUENCY, true /* isNotAWord */,

java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -62,8 +62,8 @@ public class UserHistoryDictionary extends DecayingExpandableBinaryDictionaryBas
		final PrevWordsInfo prevWordsInfo, final String word, final boolean isValid,
		final int timestamp, final DistracterFilter distracterFilter) {
		final CharSequence prevWord = prevWordsInfo.mPrevWordsInfo[0].mWord;
		if (word.length() >= Constants.DICTIONARY_MAX_WORD_LENGTH \|\|
		(prevWord != null && prevWord.length() >= Constants.DICTIONARY_MAX_WORD_LENGTH)) {
		if (word.length() > Constants.DICTIONARY_MAX_WORD_LENGTH \|\|
		(prevWord != null && prevWord.length() > Constants.DICTIONARY_MAX_WORD_LENGTH)) {
		return;
		}
		final int frequency = isValid ?

java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -386,8 +386,7 @@ public class DictionaryInfoUtils {
		final SpacingAndPunctuations spacingAndPunctuations) {
		if (TextUtils.isEmpty(text)) return false;
		final int length = text.length();
		// TODO: Make this test "length > Constants.DICTIONARY_MAX_WORD_LENGTH".
		if (length >= Constants.DICTIONARY_MAX_WORD_LENGTH) {
		if (length > Constants.DICTIONARY_MAX_WORD_LENGTH) {
		return false;
		}
		int i = 0;