am d24f9397: Merge "Make shortcut-only user dict entry non-words." (68b392cc) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -173,7 +173,8 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
		// capitalization of i.
		final int wordLen = StringUtils.codePointCount(word);
		if (wordLen < MAX_WORD_LENGTH && wordLen > 1) {
		super.addWord(word, null /* shortcut */, FREQUENCY_FOR_CONTACTS);
		super.addWord(word, null /* shortcut */, FREQUENCY_FOR_CONTACTS,
		false /* isNotAWord */);
		if (!TextUtils.isEmpty(prevWord)) {
		if (mUseFirstLastBigrams) {
		super.setBigram(prevWord, word, FREQUENCY_FOR_CONTACTS_BIGRAM);

+4 −3

Original line number	Diff line number	Diff line
		@@ -176,14 +176,15 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
		*/
		// TODO: Create "cache dictionary" to cache fresh words for frequently updated dictionaries,
		// considering performance regression.
		protected void addWord(final String word, final String shortcutTarget, final int frequency) {
		protected void addWord(final String word, final String shortcutTarget, final int frequency,
		final boolean isNotAWord) {
		if (shortcutTarget == null) {
		mFusionDictionary.add(word, frequency, null, false /* isNotAWord */);
		mFusionDictionary.add(word, frequency, null, isNotAWord);
		} else {
		// TODO: Do this in the subclass, with this class taking an arraylist.
		final ArrayList<WeightedString> shortcutTargets = CollectionUtils.newArrayList();
		shortcutTargets.add(new WeightedString(shortcutTarget, frequency));
		mFusionDictionary.add(word, frequency, shortcutTargets, false /* isNotAWord */);
		mFusionDictionary.add(word, frequency, shortcutTargets, isNotAWord);
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -258,10 +258,10 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary {
		final int adjustedFrequency = scaleFrequencyFromDefaultToLatinIme(frequency);
		// Safeguard against adding really long words.
		if (word.length() < MAX_WORD_LENGTH) {
		super.addWord(word, null, adjustedFrequency);
		super.addWord(word, null, adjustedFrequency, false /* isNotAWord */);
		}
		if (null != shortcut && shortcut.length() < MAX_WORD_LENGTH) {
		super.addWord(shortcut, word, adjustedFrequency);
		super.addWord(shortcut, word, adjustedFrequency, true /* isNotAWord */);
		}
		cursor.moveToNext();
		}