PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2012-06-12 15:58:42 -07:00
committed by Android (Google) Code Review
parent a658913475 093cf6094c
commit 99f27dc554
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
View File

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