PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove logic of calling InputMethodAndSubtypeUtil."

Browse Source
This commit is contained in:
Fan Zhang
2016-11-07 18:18:40 +00:00
committed by Android (Google) Code Review
parent 7304370954 25cd53f0a9
commit e185c5cc19
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
View File

@@ -72,7 +72,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
private Preference mLanguagePref; private Preference mLanguagePref;
private InputManager mIm; private InputManager mIm;
private Intent mIntentWaitingForResult; private Intent mIntentWaitingForResult;
private InputMethodSettingValuesWrapper mInputMethodSettingValues;
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
@@ -86,7 +85,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
addPreferencesFromResource(R.xml.language_settings); addPreferencesFromResource(R.xml.language_settings);
final Activity activity = getActivity(); final Activity activity = getActivity();
mInputMethodSettingValues = InputMethodSettingValuesWrapper.getInstance(activity);
if (activity.getAssets().getLocales().length == 1) { if (activity.getAssets().getLocales().length == 1) {
// No "Select language" pref if there's only one system locale available. // 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)); updateUserDictionaryPreference(findPreference(KEY_USER_DICTIONARY_SETTINGS));
updateInputDevices(); updateInputDevices();
// Refresh internal states in mInputMethodSettingValues to keep the latest
// "InputMethodInfo"s and "InputMethodSubtype"s
mInputMethodSettingValues.refreshAllInputMethodAndSubtypes();
} }
@Override @Override
@@ -201,11 +195,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
super.onPause(); super.onPause();
mIm.unregisterInputDeviceListener(this); mIm.unregisterInputDeviceListener(this);
// TODO: Consolidate the logic to InputMethodSettingsWrapper
InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(
this, getContentResolver(), mInputMethodSettingValues.getInputMethodList(),
false /* hasHardKeyboard */);
} }
@Override @Override