From aa4fa0ea0950ecd61af64a6bdeea109cfed64362 Mon Sep 17 00:00:00 2001 From: Satoshi Kataoka Date: Wed, 30 Oct 2013 13:35:45 -0700 Subject: [PATCH] Fix a bug on updating enabled IMEs Bug: 11354619 Change-Id: Ie33630b3dc150536bc0325ad6116ea5fdcf60740 --- .../inputmethod/InputMethodAndLanguageSettings.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index 1e4c8b106fe..3a948651d35 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -292,10 +292,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment // Refresh internal states in mInputMethodSettingValues to keep the latest // "InputMethodInfo"s and "InputMethodSubtype"s mInputMethodSettingValues.refreshAllInputMethodAndSubtypes(); - // TODO: Consolidate the logic to InputMethodSettingsWrapper - InputMethodAndSubtypeUtil.loadInputMethodSubtypeList( - this, getContentResolver(), - mInputMethodSettingValues.getInputMethodList(), null); updateInputMethodPreferenceViews(); } @@ -437,6 +433,13 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment } } updateCurrentImeName(); + // TODO: Consolidate the logic with InputMethodSettingsWrapper + // CAVEAT: The preference class here does not know about the default value - that is + // managed by the Input Method Manager Service, so in this case it could save the wrong + // value. Hence we must update the checkboxes here. + InputMethodAndSubtypeUtil.loadInputMethodSubtypeList( + this, getContentResolver(), + mInputMethodSettingValues.getInputMethodList(), null); } private void updateCurrentImeName() {