make the settings overrides in subtype work

This commit is contained in:
Helium314 2025-02-19 23:00:58 +01:00
parent eec197c32c
commit 8d094e268a
20 changed files with 257 additions and 155 deletions

View file

@ -669,11 +669,15 @@ public class LatinIME extends InputMethodService implements
} else {
subtypeLocale = subtypeSwitcherLocale;
}
if (mDictionaryFacilitator.isForLocale(subtypeLocale)
&& mDictionaryFacilitator.isForAccount(mSettings.getCurrent().mAccount)
&& mDictionaryFacilitator.usesContacts() == mSettings.getCurrent().mUseContactsDictionary
&& mDictionaryFacilitator.usesPersonalization() == mSettings.getCurrent().mUsePersonalizedDicts
) {
final ArrayList<Locale> locales = new ArrayList<>();
locales.add(subtypeLocale);
locales.addAll(mSettings.getCurrent().mSecondaryLocales);
if (mDictionaryFacilitator.usesSameSettings(
locales,
mSettings.getCurrent().mUseContactsDictionary,
mSettings.getCurrent().mUsePersonalizedDicts,
mSettings.getCurrent().mAccount
)) {
return;
}
resetDictionaryFacilitator(subtypeLocale);