nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 8a2537e0: Merge "Update personalized dict only when single subtype is used." 

* commit '8a2537e0ae324466c201573845b681bbab2e625e':
  Update personalized dict only when single subtype is used.
main
Keisuke Kuroyanagi 2014-01-07 01:42:02 -08:00 committed by Android Git Automerger
parent f8b49631fd 8a2537e0ae
commit 76a5035b28
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -523,7 +523,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
suggest.close();
}
if (currentSettingsValues.mUsePersonalizedDicts) {
PersonalizationDictionarySessionRegistrar.init(this);
if (mSubtypeSwitcher.isSystemLocaleSameAsLocaleOfAllEnabledSubtypes()) {
PersonalizationDictionarySessionRegistrar.init(this);
} else {
PersonalizationDictionarySessionRegistrar.close(this);
}
} else {
PersonalizationHelper.removeAllPersonalizedDictionaries(this);
PersonalizationDictionarySessionRegistrar.resetAll(this);
@ -595,7 +599,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
ResearchLogger.getInstance().onDestroy();
}
unregisterReceiver(mDictionaryPackInstallReceiver);
PersonalizationDictionarySessionRegistrar.onDestroy(this);
PersonalizationDictionarySessionRegistrar.close(this);
LatinImeLogger.commit();
LatinImeLogger.onDestroy();
super.onDestroy();

12
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
View File

@ -273,6 +273,18 @@ public final class SubtypeSwitcher {
return mNeedsToDisplayLanguage.getValue();
}
public boolean isSystemLocaleSameAsLocaleOfAllEnabledSubtypes() {
final Locale systemLocale = mResources.getConfiguration().locale;
final List<InputMethodSubtype> enabledSubtypesOfThisIme =
mRichImm.getMyEnabledInputMethodSubtypeList(true);
for (final InputMethodSubtype subtype : enabledSubtypesOfThisIme) {
if (!systemLocale.equals(SubtypeLocaleUtils.getSubtypeLocale(subtype))) {
return false;
}
}
return true;
}
private static InputMethodSubtype sForcedSubtypeForTesting = null;
@UsedForTesting
void forceSubtype(final InputMethodSubtype subtype) {

2
java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionarySessionRegistrar.java
View File

@ -35,6 +35,6 @@ public class PersonalizationDictionarySessionRegistrar {
public static void resetAll(final Context context) {
}
public static void onDestroy(final Context context) {
public static void close(final Context context) {
}
}