commit 7cf99f5f1239f2e657b5592e286f0c0d31661da0
author Fan Zhang <zhfan@google.com> Fri Feb 16 10:37:37 2018 -0800
committer Fan Zhang <zhfan@google.com> Sun Feb 18 21:10:03 2018 -0800
tree 87e1ac05686259bddc349181246bdeb418d089e9
parent 6f367a79cee128b49a353cf81efed1112572cc20

Migrate more settings to use SubSettingsLauncher

Bug: 73250851
Test: robotests
Change-Id: I08f6f380489646231d6d8ceb1488e2efb036bf69

src/com/android/settings/MasterClear.java

diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 4f5c6b9..f66b1f9 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -56,6 +56,7 @@
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.ConfirmLockPattern;
 import com.android.settingslib.RestrictedLockUtils;
@@ -156,12 +157,15 @@
 
     @VisibleForTesting
     void showFinalConfirmation() {
-        Bundle args = new Bundle();
+        final Bundle args = new Bundle();
         args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
         args.putBoolean(ERASE_ESIMS_EXTRA, mEsimStorage.isChecked());
-        ((SettingsActivity) getActivity()).startPreferencePanel(
-                this, MasterClearConfirm.class.getName(),
-                args, R.string.master_clear_confirm_title, null, null, 0);
+        new SubSettingLauncher(getContext())
+                .setDestination(MasterClearConfirm.class.getName())
+                .setArguments(args)
+                .setTitle(R.string.master_clear_confirm_title)
+                .setSourceMetricsCategory(getMetricsCategory())
+                .launch();
     }
 
     @VisibleForTesting