Remove personalization dicts for multilingual users. (d102eb80) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -512,7 +512,6 @@ public class DictionaryFacilitatorForSuggest {
		}
		}

		@UsedForTesting
		public void clearUserHistoryDictionary() {
		if (mUserHistoryDictionary == null) {
		return;

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

+20 −9

Original line number	Diff line number	Diff line
		@@ -534,17 +534,28 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		}

		private void refreshPersonalizationDictionarySession() {
		final Suggest suggest = mInputLogic.mSuggest;
		final boolean shouldKeepUserHistoryDictionaries;
		final boolean shouldKeepPersonalizationDictionaries;
		if (mSettings.getCurrent().mUsePersonalizedDicts) {
		if (mSubtypeSwitcher.isSystemLocaleSameAsLocaleOfAllEnabledSubtypes()) {
		final DictionaryFacilitatorForSuggest dictionaryFacilitator =
		(mInputLogic.mSuggest == null) ?
		null : mInputLogic.mSuggest.mDictionaryFacilitator;
		PersonalizationDictionarySessionRegistrar.init(this, dictionaryFacilitator);
		shouldKeepUserHistoryDictionaries = true;
		// TODO: Eliminate this restriction
		shouldKeepPersonalizationDictionaries =
		mSubtypeSwitcher.isSystemLocaleSameAsLocaleOfAllEnabledSubtypes();
		} else {
		PersonalizationDictionarySessionRegistrar.close(this);
		shouldKeepUserHistoryDictionaries = false;
		shouldKeepPersonalizationDictionaries = false;
		}
		} else {
		PersonalizationHelper.removeAllPersonalizedDictionaries(this);
		if (!shouldKeepUserHistoryDictionaries) {
		// Remove user history dictionaries.
		PersonalizationHelper.removeAllUserHistoryDictionaries(this);
		if (suggest != null) {
		suggest.mDictionaryFacilitator.clearUserHistoryDictionary();
		}
		}
		if (!shouldKeepPersonalizationDictionaries) {
		// Remove personalization dictionaries.
		PersonalizationHelper.removeAllPersonalizationDictionaries(this);
		PersonalizationDictionarySessionRegistrar.resetAll(this);
		}
		}

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -93,13 +93,16 @@ public class PersonalizationHelper {
		}
		}

		public static void removeAllPersonalizedDictionaries(final Context context) {
		removeAllDictionaries(context, sLangUserHistoryDictCache,
		UserHistoryDictionary.NAME);
		public static void removeAllPersonalizationDictionaries(final Context context) {
		removeAllDictionaries(context, sLangPersonalizationDictCache,
		PersonalizationDictionary.NAME);
		}

		public static void removeAllUserHistoryDictionaries(final Context context) {
		removeAllDictionaries(context, sLangUserHistoryDictCache,
		UserHistoryDictionary.NAME);
		}

		private static <T extends DecayingExpandableBinaryDictionaryBase> void removeAllDictionaries(
		final Context context, final ConcurrentHashMap<String, SoftReference<T>> dictionaryMap,
		final String dictNamePrefix) {