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

resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp

Browse Source 
Change-Id: I73165a3d77318cbb0271e0d5c64cc49caad8f693
This commit is contained in:
Jean-Baptiste Queru
2012-06-12 15:22:22 -07:00
parent 8b16c219f0 051f46d798
commit 89d702ac68
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(); super.onResume();
mIm.registerInputDeviceListener(this, null); mIm.registerInputDeviceListener(this, null);
mSettingsObserver.resume();
if (!mIsOnlyImeSettings) { if (!mIsOnlyImeSettings) {
if (mLanguagePref != null) { if (mLanguagePref != null) {
@@ -264,6 +265,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
mSettingsObserver.pause();
mIm.unregisterInputDeviceListener(this); mIm.unregisterInputDeviceListener(this);
if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) { if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
@@ -509,17 +511,27 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
} }
private class SettingsObserver extends ContentObserver { private class SettingsObserver extends ContentObserver {
private Context mContext;
public SettingsObserver(Handler handler, Context context) { public SettingsObserver(Handler handler, Context context) {
super(handler); 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( cr.registerContentObserver(
Settings.Secure.getUriFor(Settings.Secure.DEFAULT_INPUT_METHOD), false, this); Settings.Secure.getUriFor(Settings.Secure.DEFAULT_INPUT_METHOD), false, this);
cr.registerContentObserver(Settings.Secure.getUriFor( cr.registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE), false, this); Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE), false, this);
} }
@Override public void onChange(boolean selfChange) { public void pause() {
updateCurrentImeName(); mContext.getContentResolver().unregisterContentObserver(this);
} }
} }
} }