diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-06-14 15:38:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-14 15:38:31 -0700 |
| commit | eb5e633a2488456874f829263fa6cb96588d25aa (patch) | |
| tree | 32177fc8bcfd5ae33be1c48f40a8a9ade20dc4be /core | |
| parent | 7c7f8e18dee8b582ec8e30a1412903ceec2ef5f5 (diff) | |
| parent | 608a200d2ed19540bb356d54e96f72c8c6b089b1 (diff) | |
| download | frameworks_base-eb5e633a2488456874f829263fa6cb96588d25aa.zip frameworks_base-eb5e633a2488456874f829263fa6cb96588d25aa.tar.gz frameworks_base-eb5e633a2488456874f829263fa6cb96588d25aa.tar.bz2 | |
am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
* commit '608a200d2ed19540bb356d54e96f72c8c6b089b1':
Stability fixes for PreferenceFragments.
Diffstat (limited to 'core')
| -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 4e22ba0..7766b54 100644 --- a/core/java/android/preference/PreferenceFragment.java +++ b/core/java/android/preference/PreferenceFragment.java @@ -145,7 +145,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 @@ -178,9 +177,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 @@ -195,7 +201,6 @@ public abstract class PreferenceFragment extends Fragment implements public void onDestroy() { super.onDestroy(); mPreferenceManager.dispatchActivityDestroy(); - mPreferenceManager.setOnPreferenceTreeClickListener(null); } @Override |