Add visibility metrics to dialogs.

Bug: 30681529
Test: adb logcat -b events | egrep "(sysui_|notification_)"
Change-Id: I199d2e1b2cb8588a562b46bb8128d8ece24952f0
This commit is contained in:
Fan Zhang
2016-09-16 12:45:07 -07:00
parent 9560b36306
commit 1e516287bd
30 changed files with 311 additions and 59 deletions

View File

@@ -31,6 +31,7 @@ import android.service.notification.NotificationListenerService;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.utils.ManagedServiceSettings;
import com.android.settings.utils.ServiceListing;
@@ -102,7 +103,7 @@ public class NotificationAccessSettings extends ManagedServiceSettings {
});
}
public class FriendlyWarningDialogFragment extends DialogFragment {
public class FriendlyWarningDialogFragment extends InstrumentedDialogFragment {
static final String KEY_COMPONENT = "c";
static final String KEY_LABEL = "l";
@@ -114,6 +115,11 @@ public class NotificationAccessSettings extends ManagedServiceSettings {
return this;
}
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_DISABLE_NOTIFICATION_ACCESS;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

View File

@@ -66,6 +66,7 @@ import com.android.settings.RingtonePreference;
import com.android.settings.DefaultRingtonePreference;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -826,11 +827,16 @@ public class SoundSettings extends SettingsPreferenceFragment
mWorkAlarmRingtonePreference = null;
}
public static class UnifyWorkDialogFragment extends DialogFragment
public static class UnifyWorkDialogFragment extends InstrumentedDialogFragment
implements DialogInterface.OnClickListener {
private static final String TAG = "UnifyWorkDialogFragment";
private static final int REQUEST_CODE = 200;
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_UNIFY_SOUND_SETTINGS;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity())

View File

@@ -46,6 +46,7 @@ import android.widget.Toast;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import java.util.ArrayList;
import java.util.Collections;
@@ -203,10 +204,15 @@ public class ZenAccessSettings extends EmptyTextSettings {
/**
* Warning dialog when allowing zen access warning about the privileges being granted.
*/
public static class ScaryWarningDialogFragment extends DialogFragment {
public static class ScaryWarningDialogFragment extends InstrumentedDialogFragment {
static final String KEY_PKG = "p";
static final String KEY_LABEL = "l";
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_ZEN_ACCESS_GRANT;
}
public ScaryWarningDialogFragment setPkgInfo(String pkg, CharSequence label) {
Bundle args = new Bundle();
args.putString(KEY_PKG, pkg);
@@ -249,10 +255,16 @@ public class ZenAccessSettings extends EmptyTextSettings {
/**
* Warning dialog when revoking zen access warning that zen rule instances will be deleted.
*/
public static class FriendlyWarningDialogFragment extends DialogFragment {
public static class FriendlyWarningDialogFragment extends InstrumentedDialogFragment {
static final String KEY_PKG = "p";
static final String KEY_LABEL = "l";
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_ZEN_ACCESS_REVOKE;
}
public FriendlyWarningDialogFragment setPkgInfo(String pkg, CharSequence label) {
Bundle args = new Bundle();
args.putString(KEY_PKG, pkg);

View File

@@ -39,6 +39,7 @@ import android.widget.TimePicker;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import java.text.SimpleDateFormat;
import java.util.Arrays;
@@ -275,10 +276,15 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
setSummary(time);
}
public static class TimePickerFragment extends DialogFragment implements
public static class TimePickerFragment extends InstrumentedDialogFragment implements
TimePickerDialog.OnTimeSetListener {
public TimePickerPreference pref;
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_ZEN_TIMEPICKER;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
final boolean usePref = pref != null && pref.mHourOfDay >= 0 && pref.mMinute >= 0;