Migrate all MetricsProto enums to SettingsEnums

Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
This commit is contained in:
Fan Zhang
2019-01-16 13:49:47 -08:00
parent dbaa5459b8
commit 31b210017b
502 changed files with 1184 additions and 1347 deletions

View File

@@ -18,11 +18,11 @@ package com.android.settings;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.datetime.AutoTimeFormatPreferenceController;
@@ -54,7 +54,7 @@ public class DateTimeSettings extends DashboardFragment implements
@Override
public int getMetricsCategory() {
return MetricsEvent.DATE_TIME;
return SettingsEnums.DATE_TIME;
}
@Override
@@ -127,9 +127,9 @@ public class DateTimeSettings extends DashboardFragment implements
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case DatePreferenceController.DIALOG_DATEPICKER:
return MetricsEvent.DIALOG_DATE_PICKER;
return SettingsEnums.DIALOG_DATE_PICKER;
case TimePreferenceController.DIALOG_TIMEPICKER:
return MetricsEvent.DIALOG_TIME_PICKER;
return SettingsEnums.DIALOG_TIME_PICKER;
default:
return 0;
}