summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-12 15:43:17 -0700
committerJean-Baptiste Queru <jbq@google.com>2012-06-12 15:43:17 -0700
commit093cf6094c2fdf6d84e3ae7ecb53aa955e893c38 (patch)
treeba79bc4b2ad599826366ab65d48e7fd8faea903d /src/com/android
parent89d702ac6864e0111ea2f16a524c71804bae5a5c (diff)
downloadpackages_apps_settings-093cf6094c2fdf6d84e3ae7ecb53aa955e893c38.zip
packages_apps_settings-093cf6094c2fdf6d84e3ae7ecb53aa955e893c38.tar.gz
packages_apps_settings-093cf6094c2fdf6d84e3ae7ecb53aa955e893c38.tar.bz2
Swap start/stop of SettingsObserver and InputDeviceListener
Change-Id: Ic6b7bab860f71889a6ec476ccab1e83d2efd0e64
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java4
1 files changed, 2 insertions, 2 deletions
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 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);