From 25cd53f0a96e0ad87b47b721d43bceca7f78ed26 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Fri, 4 Nov 2016 14:51:53 -0700 Subject: [PATCH] Remove logic of calling InputMethodAndSubtypeUtil. InputMethodAndLanguageSettings calls InputMethodAndSubtypeUtil for no good reason. The page does not display or provide ways to change IMEs. The virtualKeyboardFragment does, and it already contains logic for refreshing InputMethodAndSubtypeUtil. Bug: 32642706 Test: Compiles Change-Id: Icdbf9cd2fa95ba3037c1e47d62c7514376cf8037 --- .../inputmethod/InputMethodAndLanguageSettings.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index ea6c529029d..9fa26455b5a 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -72,7 +72,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment private Preference mLanguagePref; private InputManager mIm; private Intent mIntentWaitingForResult; - private InputMethodSettingValuesWrapper mInputMethodSettingValues; @Override public int getMetricsCategory() { @@ -86,7 +85,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment addPreferencesFromResource(R.xml.language_settings); final Activity activity = getActivity(); - mInputMethodSettingValues = InputMethodSettingValuesWrapper.getInstance(activity); if (activity.getAssets().getLocales().length == 1) { // No "Select language" pref if there's only one system locale available. @@ -190,10 +188,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment updateUserDictionaryPreference(findPreference(KEY_USER_DICTIONARY_SETTINGS)); updateInputDevices(); - - // Refresh internal states in mInputMethodSettingValues to keep the latest - // "InputMethodInfo"s and "InputMethodSubtype"s - mInputMethodSettingValues.refreshAllInputMethodAndSubtypes(); } @Override @@ -201,11 +195,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment super.onPause(); mIm.unregisterInputDeviceListener(this); - - // TODO: Consolidate the logic to InputMethodSettingsWrapper - InputMethodAndSubtypeUtil.saveInputMethodSubtypeList( - this, getContentResolver(), mInputMethodSettingValues.getInputMethodList(), - false /* hasHardKeyboard */); } @Override