commit 98880c463817da6fcfaaebf7dcfd3aab1f33ee7c
author Jean-Baptiste Queru <jbq@google.com> Tue Jun 12 16:00:33 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 12 16:00:33 2012 -0700
tree ef7ccb12dfc2f25c2de2ca015948887cdb2035ad
parent 4ce87f0c886756aa9569d804e89074f9353ff7dc
parent 99f27dc554c7937bc1afbcae0c40e364d025ca2d

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

* commit '99f27dc554c7937bc1afbcae0c40e364d025ca2d':
  Swap start/stop of SettingsObserver and InputDeviceListener

src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 9624c4a..5459275 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -224,8 +224,8 @@
     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 void onPause() {
         super.onPause();
 
-        mSettingsObserver.pause();
         mIm.unregisterInputDeviceListener(this);
+        mSettingsObserver.pause();
 
         if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
             mShowInputMethodSelectorPref.setOnPreferenceChangeListener(null);