diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-06-14 20:56:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-14 20:56:23 -0700 |
| commit | 0daf40ca9a764088c3eb59be956674ac67b91384 (patch) | |
| tree | 6ad00e31a6d011a9fc4750d85da27dd49d3d18d8 /core/java | |
| parent | 938ef7aeb75268c0b092727fb76e999ffb744b56 (diff) | |
| parent | 2bcd9c6e7b4fe6c465811e9b8ac48acec23cb341 (diff) | |
| download | frameworks_base-0daf40ca9a764088c3eb59be956674ac67b91384.zip frameworks_base-0daf40ca9a764088c3eb59be956674ac67b91384.tar.gz frameworks_base-0daf40ca9a764088c3eb59be956674ac67b91384.tar.bz2 | |
am 2bcd9c6e: am eb5e633a: am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
* commit '2bcd9c6e7b4fe6c465811e9b8ac48acec23cb341':
Stability fixes for PreferenceFragments.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/preference/PreferenceFragment.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java index 9d46b7a..488919c 100644 --- a/core/java/android/preference/PreferenceFragment.java +++ b/core/java/android/preference/PreferenceFragment.java @@ -146,7 +146,6 @@ public abstract class PreferenceFragment extends Fragment implements super.onCreate(savedInstanceState); mPreferenceManager = new PreferenceManager(getActivity(), FIRST_REQUEST_CODE); mPreferenceManager.setFragment(this); - mPreferenceManager.setOnPreferenceTreeClickListener(this); } @Override @@ -179,9 +178,16 @@ public abstract class PreferenceFragment extends Fragment implements } @Override + public void onStart() { + super.onStart(); + mPreferenceManager.setOnPreferenceTreeClickListener(this); + } + + @Override public void onStop() { super.onStop(); mPreferenceManager.dispatchActivityStop(); + mPreferenceManager.setOnPreferenceTreeClickListener(null); } @Override @@ -196,7 +202,6 @@ public abstract class PreferenceFragment extends Fragment implements public void onDestroy() { super.onDestroy(); mPreferenceManager.dispatchActivityDestroy(); - mPreferenceManager.setOnPreferenceTreeClickListener(null); } @Override |