diff options
| author | satok <satok@google.com> | 2011-01-12 01:18:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-12 01:18:06 -0800 |
| commit | e43bc7ee22a633a1ba257f5d2201e1884710b350 (patch) | |
| tree | 8f2e9cd095ea5c88bb9e3544885cb5b72a8a2ccd /src | |
| parent | 55b7d27936f39c2d6e609c15b1086e9698dbbcfd (diff) | |
| parent | 74a5414b3c4473106ab2c043d52d8b55a9e4d0c5 (diff) | |
| download | packages_apps_settings-e43bc7ee22a633a1ba257f5d2201e1884710b350.zip packages_apps_settings-e43bc7ee22a633a1ba257f5d2201e1884710b350.tar.gz packages_apps_settings-e43bc7ee22a633a1ba257f5d2201e1884710b350.tar.bz2 | |
Merge "Automatically turn on "Use system language" when no subtypes become selected Bug: 3327257" into honeycomb
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment { } else { InputMethodAndSubtypeUtil.setSubtypesPreferenceEnabled( this, mInputMethodProperties, id, false); + updateAutoSelectionCB(); } } return super.onPreferenceTreeClick(preferenceScreen, preference); @@ -247,7 +248,9 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment { } 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) { |