am 99f27dc5
: Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-dev-plus-aosp
* commit '99f27dc554c7937bc1afbcae0c40e364d025ca2d': Swap start/stop of SettingsObserver and InputDeviceListener
This commit is contained in:
committed by
Android Git Automerger
commit
98880c4638
@@ -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);
|
||||
|
Reference in New Issue
Block a user