nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 424a976e: Merge "Ensure Preference listener is unregistered" 

* commit '424a976e58ea40e44f28ac4b6aacc4656a4c1377':
  Ensure Preference listener is unregistered
main
Kurt Partridge 2013-02-26 19:51:14 -08:00 committed by Android Git Automerger
parent 14de0d22ab 424a976e58
commit d9ca1a3f2c
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -561,6 +561,9 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
} }
mSettings.onDestroy(); mSettings.onDestroy();
unregisterReceiver(mReceiver); unregisterReceiver(mReceiver);
if (ProductionFlag.IS_EXPERIMENTAL) {
ResearchLogger.getInstance().onDestroy();
}
// TODO: The experimental version is not supported by the Dictionary Pack Service yet. // TODO: The experimental version is not supported by the Dictionary Pack Service yet.
if (!ProductionFlag.IS_EXPERIMENTAL) { if (!ProductionFlag.IS_EXPERIMENTAL) {
unregisterReceiver(mDictionaryPackInstallReceiver); unregisterReceiver(mDictionaryPackInstallReceiver);

6
java/src/com/android/inputmethod/research/ResearchLogger.java
View File

@ -322,6 +322,12 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
mMainKeyboardView = null; mMainKeyboardView = null;
} }
public void onDestroy() {
if (mPrefs != null) {
mPrefs.unregisterOnSharedPreferenceChangeListener(this);
}
}
private boolean hasSeenSplash() { private boolean hasSeenSplash() {
return mPrefs.getBoolean(PREF_RESEARCH_HAS_SEEN_SPLASH, false); return mPrefs.getBoolean(PREF_RESEARCH_HAS_SEEN_SPLASH, false);
} }