diff options
| author | Fan Zhang <zhfan@google.com> | 2016-11-07 18:18:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-11-07 18:18:41 +0000 |
| commit | e185c5cc1997f49080c9c8bacf0d398eefd542a5 (patch) | |
| tree | cdc263a37554b36c797d0601d4ba0f7658b84bbd /src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | |
| parent | 73043709540981c7d58ee43397720b0e9dc171c1 (diff) | |
| parent | 25cd53f0a96e0ad87b47b721d43bceca7f78ed26 (diff) | |
| download | packages_apps_Settings-e185c5cc1997f49080c9c8bacf0d398eefd542a5.tar.gz packages_apps_Settings-e185c5cc1997f49080c9c8bacf0d398eefd542a5.tar.bz2 packages_apps_Settings-e185c5cc1997f49080c9c8bacf0d398eefd542a5.zip | |
Merge "Remove logic of calling InputMethodAndSubtypeUtil."
Diffstat (limited to 'src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java')
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index ea6c529029..9fa26455b5 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 |