Automatically turn on "Use system language" when no subtypes become selected
Bug: 3327257
Change-Id: I99a8c2769957963db99fa72be6cc76cc9cd97abf
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index 1575e13..ab4180a 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -152,6 +152,7 @@
} else {
InputMethodAndSubtypeUtil.setSubtypesPreferenceEnabled(
this, mInputMethodProperties, id, false);
+ updateAutoSelectionCB();
}
}
return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -247,7 +248,9 @@
}
private void setSubtypeAutoSelectionEnabled(String imiId, boolean autoSelectionEnabled) {
- mSubtypeAutoSelectionCBMap.get(imiId).setChecked(autoSelectionEnabled);
+ CheckBoxPreference autoSelectionCB = mSubtypeAutoSelectionCBMap.get(imiId);
+ if (autoSelectionCB == null) return;
+ autoSelectionCB.setChecked(autoSelectionEnabled);
final List<Preference> subtypePrefs = mInputMethodAndSubtypePrefsMap.get(imiId);
for (Preference subtypePref: subtypePrefs) {
if (subtypePref instanceof CheckBoxPreference) {