Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-dev-plus-aosp

This commit is contained in:
Jean-Baptiste Queru
2012-06-12 15:58:42 -07:00
committed by Android (Google) Code Review

View File

@@ -224,8 +224,8 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
public void onResume() {
super.onResume();
mIm.registerInputDeviceListener(this, null);
mSettingsObserver.resume();
mIm.registerInputDeviceListener(this, null);
if (!mIsOnlyImeSettings) {
if (mLanguagePref != null) {
@@ -265,8 +265,8 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
public void onPause() {
super.onPause();
mSettingsObserver.pause();
mIm.unregisterInputDeviceListener(this);
mSettingsObserver.pause();
if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
mShowInputMethodSelectorPref.setOnPreferenceChangeListener(null);