diff options
author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-24 11:29:31 -0700 |
---|---|---|
committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-09-28 12:12:11 -0700 |
commit | 25af150c9804cbca83461588fa5277908baa943d (patch) | |
tree | 99a0cc36b0cb75d31d8988ad1bdfa1a42fcd3671 /src/com/android/settings/SettingsPreferenceFragment.java | |
parent | 379d9b05cff677bc03a5a8a5bbccf4ffb918734d (diff) | |
download | packages_apps_Settings-25af150c9804cbca83461588fa5277908baa943d.tar.gz packages_apps_Settings-25af150c9804cbca83461588fa5277908baa943d.tar.bz2 packages_apps_Settings-25af150c9804cbca83461588fa5277908baa943d.zip |
Remove OnStateListener and FragmentStarter.
Those interfaces aren't available any more, as we make Settings
inherit PreferenceActivity.
Bug: 3034757
Change-Id: I2f778a12168e3033291d6935bcc73637e7c78c0b
Diffstat (limited to 'src/com/android/settings/SettingsPreferenceFragment.java')
-rw-r--r-- | src/com/android/settings/SettingsPreferenceFragment.java | 59 |
1 files changed, 9 insertions, 50 deletions
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index f41561e86..42118149c 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -58,44 +58,11 @@ public class SettingsPreferenceFragment extends PreferenceFragment private SettingsDialogFragment mDialogFragment; - private OnStateListener mOnStateListener; - private FragmentStarter mFragmentStarter; - private int mResultCode = Activity.RESULT_CANCELED; private Intent mResultData; private Button mNextButton; - private boolean mReportedCreation; - - interface OnStateListener { - - void onCreated(SettingsPreferenceFragment fragment); - - void onDestroyed(SettingsPreferenceFragment fragment); - } - - public void setOnStateListener(OnStateListener listener) { - mOnStateListener = listener; - } - - /** - * Letting the class, assumed to be Fragment, start another Fragment object. - * The target Fragment object is stored in the caller Fragment using - * {@link Fragment#setTargetFragment(Fragment, int)}. The caller - * is able to obtain result code and result data via - * {@link SettingsPreferenceFragment#getResultCode()} and - * {@link SettingsPreferenceFragment#getResultData()} accordingly. - */ - interface FragmentStarter { - public boolean startFragment( - Fragment caller, String fragmentClass, int requestCode, Bundle extras); - } - - public void setFragmentStarter(FragmentStarter starter) { - mFragmentStarter = starter; - } - @Override public void onResume() { super.onResume(); @@ -119,12 +86,6 @@ public class SettingsPreferenceFragment extends PreferenceFragment @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - if (mOnStateListener != null && !mReportedCreation) { - mOnStateListener.onCreated(this); - // So that we don't report it on the way back to this fragment - mReportedCreation = true; - } - setupButtonBar(); } @@ -154,14 +115,6 @@ public class SettingsPreferenceFragment extends PreferenceFragment getActivity().onBackPressed(); } - @Override - public void onDestroy() { - super.onDestroy(); - if (mOnStateListener != null) { - mOnStateListener.onDestroyed(this); - } - } - // Some helpers for functions used by the settings fragments when they were activities /** @@ -249,10 +202,16 @@ public class SettingsPreferenceFragment extends PreferenceFragment public boolean startFragment( Fragment caller, String fragmentClass, int requestCode, Bundle extras) { - if (mFragmentStarter != null) { - return mFragmentStarter.startFragment(caller, fragmentClass, requestCode, extras); + if (getActivity() instanceof PreferenceActivity) { + PreferenceActivity preferenceActivity = (PreferenceActivity)getActivity(); + Fragment f = Fragment.instantiate(getActivity(), fragmentClass, extras); + caller.setTargetFragment(f, requestCode); + preferenceActivity.switchToHeader(fragmentClass, extras); + return true; } else { - Log.w(TAG, "FragmentStarter is not set."); + Log.w(TAG, "Parent isn't PreferenceActivity, thus there's no way to launch the " + + "given Fragment (name: " + fragmentClass + ", requestCode: " + requestCode + + ")"); return false; } } |