diff options
| author | satok <satok@google.com> | 2011-10-17 21:54:06 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-10-18 00:21:04 +0900 |
| commit | 7ea58d31646bcfbcdd9ddd0bfdc685ed7ab3f1d8 (patch) | |
| tree | 9e99b70be5e1b69124b44c85e3b7979055dcb255 /src/com | |
| parent | 140f6c6cf705f020c0ee6a2843cf1691cc68e729 (diff) | |
| download | packages_apps_settings-7ea58d31646bcfbcdd9ddd0bfdc685ed7ab3f1d8.zip packages_apps_settings-7ea58d31646bcfbcdd9ddd0bfdc685ed7ab3f1d8.tar.gz packages_apps_settings-7ea58d31646bcfbcdd9ddd0bfdc685ed7ab3f1d8.tar.bz2 | |
Update enabled subtypes in the input method subtype enabler in "onResume"
Bug: 5446825
Change-Id: Iab52ecb8a7334b7be3a81350fbfc9b02d09e88d4
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java | 5 | ||||
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodPreference.java | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java index df58ec0..cb4058f 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java @@ -317,9 +317,9 @@ public class InputMethodAndSubtypeUtil { } } setSubtypesPreferenceEnabled(context, inputMethodInfos, imiId, isEnabled); - updateSubtypesPreferenceChecked(context, inputMethodInfos, enabledSubtypes); } } + updateSubtypesPreferenceChecked(context, inputMethodInfos, enabledSubtypes); } public static void setSubtypesPreferenceEnabled(SettingsPreferenceFragment context, @@ -346,7 +346,8 @@ public class InputMethodAndSubtypeUtil { PreferenceScreen preferenceScreen = context.getPreferenceScreen(); for (InputMethodInfo imi : inputMethodProperties) { String id = imi.getId(); - HashSet<String> enabledSubtypesSet = enabledSubtypes.get(id); + if (!enabledSubtypes.containsKey(id)) break; + final HashSet<String> enabledSubtypesSet = enabledSubtypes.get(id); final int subtypeCount = imi.getSubtypeCount(); for (int i = 0; i < subtypeCount; ++i) { InputMethodSubtype subtype = imi.getSubtypeAt(i); diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java index f222b88..4ecdb8e 100644 --- a/src/com/android/settings/inputmethod/InputMethodPreference.java +++ b/src/com/android/settings/inputmethod/InputMethodPreference.java @@ -226,6 +226,7 @@ public class InputMethodPreference extends CheckBoxPreference public void setChecked(boolean checked) { super.setChecked(checked); saveImeSettings(); + updateSummary(); } private void showSecurityWarnDialog(InputMethodInfo imi, final CheckBoxPreference chkPref) { |