Merge "Stop promoting auto dictionary words to the user dict." (f4a05624) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -41,13 +41,8 @@ public class AutoDictionary extends ExpandableDictionary {
		static final int FREQUENCY_FOR_PICKED = 3;
		// Weight added to a user typing a new word that doesn't get corrected (or is reverted)
		static final int FREQUENCY_FOR_TYPED = 1;
		// A word that is frequently typed and gets promoted to the user dictionary, uses this
		// frequency.
		static final int FREQUENCY_FOR_AUTO_ADD = 250;
		// If the user touches a typed word 2 times or more, it will become valid.
		private static final int VALIDITY_THRESHOLD = 2 * FREQUENCY_FOR_PICKED;
		// If the user touches a typed word 4 times or more, it will be added to the user dict.
		private static final int PROMOTION_THRESHOLD = 4 * FREQUENCY_FOR_PICKED;

		private LatinIME mIme;
		// Locale for which this auto dictionary is storing words
		@@ -151,11 +146,6 @@ public class AutoDictionary extends ExpandableDictionary {
		freq = freq < 0 ? addFrequency : freq + addFrequency;
		super.addWord(word, freq);

		if (freq >= PROMOTION_THRESHOLD) {
		mIme.promoteToUserDictionary(word, FREQUENCY_FOR_AUTO_ADD);
		freq = 0;
		}

		synchronized (mPendingWritesLock) {
		// Write a null frequency if it is to be deleted from the db
		mPendingWrites.put(word, freq == 0 ? null : new Integer(freq));

+0 −7

Original line number	Diff line number	Diff line
		@@ -1635,8 +1635,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		/**
		* Commits the chosen word to the text field and saves it for later
		* retrieval.
		* @param suggestion the suggestion picked by the user to be committed to
		* the text field
		*/
		private void commitBestWord(CharSequence bestWord) {
		KeyboardSwitcher switcher = mKeyboardSwitcher;
		@@ -1924,11 +1922,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		}
		}

		public void promoteToUserDictionary(String word, int frequency) {
		if (mUserDictionary.isValidWord(word)) return;
		mUserDictionary.addWord(word, frequency);
		}

		public WordComposer getCurrentWord() {
		return mWord;
		}