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

am a6589134: Merge "resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp" into jb-dev-plus-aosp

Browse Source 
* commit 'a65891347556b4d14f6dad829017513b984d20c1':
  Unregister ContentObserver in InputMethodAndLanguageSettings class
This commit is contained in:
Jean-Baptiste Queru
2012-06-12 15:32:52 -07:00
committed by Android Git Automerger
parent b120c17170 a658913475
commit 4ce87f0c88
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,6 +225,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
super.onResume();
mIm.registerInputDeviceListener(this, null);
mSettingsObserver.resume();
if (!mIsOnlyImeSettings) {
if (mLanguagePref != null) {
@@ -264,6 +265,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
public void onPause() {
super.onPause();
mSettingsObserver.pause();
mIm.unregisterInputDeviceListener(this);
if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
@@ -509,17 +511,27 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
}
private class SettingsObserver extends ContentObserver {
private Context mContext;
public SettingsObserver(Handler handler, Context context) {
super(handler);
final ContentResolver cr = context.getContentResolver();
mContext = context;
}
@Override public void onChange(boolean selfChange) {
updateCurrentImeName();
}
public void resume() {
final ContentResolver cr = mContext.getContentResolver();
cr.registerContentObserver(
Settings.Secure.getUriFor(Settings.Secure.DEFAULT_INPUT_METHOD), false, this);
cr.registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE), false, this);
}
@Override public void onChange(boolean selfChange) {
updateCurrentImeName();
public void pause() {
mContext.getContentResolver().unregisterContentObserver(this);
}
}
}