diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index d0c9ca2d8cb..bbe31a74080 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -16,12 +16,8 @@
 
 package com.android.settings;
 
-import static android.app.Activity.RESULT_OK;
-import static android.content.Context.TELEPHONY_SERVICE;
-
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Intent;
@@ -49,10 +45,14 @@ import android.view.View;
 import android.view.View.OnKeyListener;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import static android.app.Activity.RESULT_OK;
+import static android.content.Context.TELEPHONY_SERVICE;
+
 public class ApnEditor extends SettingsPreferenceFragment
         implements OnPreferenceChangeListener, OnKeyListener {
 
@@ -753,7 +753,7 @@ public class ApnEditor extends SettingsPreferenceFragment
         }
     }
 
-    public static class ErrorDialog extends DialogFragment {
+    public static class ErrorDialog extends InstrumentedDialogFragment {
 
         public static void showError(ApnEditor editor) {
             ErrorDialog dialog = new ErrorDialog();
@@ -771,6 +771,11 @@ public class ApnEditor extends SettingsPreferenceFragment
                     .setMessage(msg)
                     .create();
         }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.DIALOG_APN_EDITOR_ERROR;
+        }
     }
 
 }
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 5d3fde39ec6..f650faee9cf 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -20,7 +20,6 @@ import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.admin.DevicePolicyManager;
@@ -45,6 +44,7 @@ import android.view.accessibility.AccessibilityManager;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreference;
 
@@ -833,7 +833,7 @@ public class ChooseLockGeneric extends SettingsActivity {
             dialog.show(getChildFragmentManager(), TAG_FRP_WARNING_DIALOG);
         }
 
-        public static class FactoryResetProtectionWarningDialog extends DialogFragment {
+        public static class FactoryResetProtectionWarningDialog extends InstrumentedDialogFragment {
 
             private static final String ARG_TITLE_RES = "titleRes";
             private static final String ARG_MESSAGE_RES = "messageRes";
@@ -886,6 +886,11 @@ public class ChooseLockGeneric extends SettingsActivity {
                         )
                         .create();
             }
+
+            @Override
+            public int getMetricsCategory() {
+                return MetricsEvent.DIALOG_FRP;
+            }
         }
     }
 }
diff --git a/src/com/android/settings/CustomListPreference.java b/src/com/android/settings/CustomListPreference.java
index e7c7600a19f..d251a658758 100644
--- a/src/com/android/settings/CustomListPreference.java
+++ b/src/com/android/settings/CustomListPreference.java
@@ -18,7 +18,6 @@ package com.android.settings;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
 import android.content.Context;
@@ -30,6 +29,9 @@ import android.support.v14.preference.ListPreferenceDialogFragment;
 import android.support.v7.preference.ListPreference;
 import android.util.AttributeSet;
 
+import com.android.internal.logging.MetricsProto;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
 public class CustomListPreference extends ListPreference {
 
     public CustomListPreference(Context context, AttributeSet attrs) {
@@ -196,7 +198,7 @@ public class CustomListPreference extends ListPreference {
         }
     }
 
-    public static class ConfirmDialogFragment extends DialogFragment {
+    public static class ConfirmDialogFragment extends InstrumentedDialogFragment {
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             return new AlertDialog.Builder(getActivity())
@@ -213,5 +215,10 @@ public class CustomListPreference extends ListPreference {
                     .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsProto.MetricsEvent.DIALOG_CUSTOM_LIST_CONFIRMATION;
+        }
     }
 }
diff --git a/src/com/android/settings/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java
index cad06931659..c736e4ae32b 100644
--- a/src/com/android/settings/OwnerInfoSettings.java
+++ b/src/com/android/settings/OwnerInfoSettings.java
@@ -18,7 +18,6 @@ package com.android.settings;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.Fragment;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
@@ -29,9 +28,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
 
+import com.android.internal.logging.MetricsProto;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
-public class OwnerInfoSettings extends DialogFragment implements OnClickListener {
+public class OwnerInfoSettings extends InstrumentedDialogFragment implements OnClickListener {
 
     private static final String TAG_OWNER_INFO = "ownerInfo";
 
@@ -88,4 +89,9 @@ public class OwnerInfoSettings extends DialogFragment implements OnClickListener
         dialog.setTargetFragment(parent, 0);
         dialog.show(parent.getFragmentManager(), TAG_OWNER_INFO);
     }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_OWNER_INFO_SETTINGS;
+    }
 }
diff --git a/src/com/android/settings/support/SupportPhoneDialogFragment.java b/src/com/android/settings/support/SupportPhoneDialogFragment.java
index 4dde547e0eb..4b2a9ce1c6c 100644
--- a/src/com/android/settings/support/SupportPhoneDialogFragment.java
+++ b/src/com/android/settings/support/SupportPhoneDialogFragment.java
@@ -18,7 +18,6 @@ package com.android.settings.support;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -28,14 +27,15 @@ import android.widget.TextView;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
 import java.util.Locale;
 
 /**
  * A dialog fragment that displays support phone numbers.
  */
-public final class SupportPhoneDialogFragment extends DialogFragment implements
-        View.OnClickListener {
+public final class SupportPhoneDialogFragment extends InstrumentedDialogFragment
+        implements View.OnClickListener {
 
     public static final String TAG = "SupportPhoneDialog";
     private static final String EXTRA_PHONE = "extra_phone";
@@ -82,4 +82,9 @@ public final class SupportPhoneDialogFragment extends DialogFragment implements
         }
         dismiss();
     }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_SUPPORT_PHONE;
+    }
 }