From 093cf6094c2fdf6d84e3ae7ecb53aa955e893c38 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 12 Jun 2012 15:43:17 -0700
Subject: [PATCH] Swap start/stop of SettingsObserver and InputDeviceListener

Change-Id: Ic6b7bab860f71889a6ec476ccab1e83d2efd0e64
---
 .../settings/inputmethod/InputMethodAndLanguageSettings.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 9624c4a062d..54592757ac1 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -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);