Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2

Browse Source 
* commit '608a200d2ed19540bb356d54e96f72c8c6b089b1':
  Stability fixes for PreferenceFragments.
This commit is contained in:
Amith Yamasani
2011-06-14 15:38:31 -07:00
committed by Android Git Automerger
parent 7c7f8e18de 608a200d2e
commit eb5e633a24
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/preference/PreferenceFragment.java
View File

@@ -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
@@ -177,10 +176,17 @@ 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