diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-06-14 15:35:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-14 15:35:13 -0700 |
| commit | 608a200d2ed19540bb356d54e96f72c8c6b089b1 (patch) | |
| tree | 2460128bd01d6097f4688930dfec7443e1ea5f43 | |
| parent | 0a8a2324239d7604e2a68349585aa67b59b25f4c (diff) | |
| parent | c56fc753e2e2d35221a1a4df353a435098268ec4 (diff) | |
| download | frameworks_base-608a200d2ed19540bb356d54e96f72c8c6b089b1.zip frameworks_base-608a200d2ed19540bb356d54e96f72c8c6b089b1.tar.gz frameworks_base-608a200d2ed19540bb356d54e96f72c8c6b089b1.tar.bz2 | |
Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2
| -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 |