summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/MasterClear.java
diff options
context:
space:
mode:
authorStuart Scott <stuartscott@google.com>2014-07-24 19:22:06 -0700
committerStuart Scott <stuartscott@google.com>2015-03-09 13:18:50 -0700
commitbe90341c808ac5b17149eb42eac966906c6f2041 (patch)
treed9e62776c992a5db7e9eb3d76f60fbac69c98a3a /src/com/android/settings/MasterClear.java
parent792343b2f5b804f941d8dc397d2017cce854f519 (diff)
downloadpackages_apps_Settings-be90341c808ac5b17149eb42eac966906c6f2041.tar.gz
packages_apps_Settings-be90341c808ac5b17149eb42eac966906c6f2041.tar.bz2
packages_apps_Settings-be90341c808ac5b17149eb42eac966906c6f2041.zip
Add option to reset network settings to factory
bug:16161518 Change-Id: I7c0cc58d5385352c6c9af2b27af23a744b5df977
Diffstat (limited to 'src/com/android/settings/MasterClear.java')
-rw-r--r--src/com/android/settings/MasterClear.java14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 18b51d9fe..9604a3c81 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -77,9 +77,8 @@ public class MasterClear extends Fragment {
*/
private boolean runKeyguardConfirmation(int request) {
Resources res = getActivity().getResources();
- return new ChooseLockSettingsHelper(getActivity(), this)
- .launchConfirmationActivity(request, null,
- res.getText(R.string.master_clear_gesture_explanation));
+ return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(request,
+ null, res.getText(R.string.master_clear_gesture_explanation));
}
@Override
@@ -100,11 +99,10 @@ public class MasterClear extends Fragment {
}
private void showFinalConfirmation() {
- Preference preference = new Preference(getActivity());
- preference.setFragment(MasterClearConfirm.class.getName());
- preference.setTitle(R.string.master_clear_confirm_title);
- preference.getExtras().putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
- ((SettingsActivity) getActivity()).onPreferenceStartFragment(null, preference);
+ Bundle args = new Bundle();
+ args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
+ ((SettingsActivity) getActivity()).startPreferencePanel(MasterClearConfirm.class.getName(),
+ args, R.string.master_clear_confirm_title, null, null, 0);
}
/**