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

@@ -19,6 +19,7 @@ package com.android.settings.network;
import android.app.Activity;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -51,7 +52,6 @@ import android.widget.Toast;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.uicc.UiccController;
@@ -173,7 +173,7 @@ public class ApnSettings extends RestrictedSettingsFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.APN;
return SettingsEnums.APN;
}
@Override
@@ -518,7 +518,7 @@ public class ApnSettings extends RestrictedSettingsFragment
@Override
public int getDialogMetricsCategory(int dialogId) {
if (dialogId == DIALOG_RESTORE_DEFAULTAPN) {
return MetricsEvent.DIALOG_APN_RESTORE_DEFAULT;
return SettingsEnums.DIALOG_APN_RESTORE_DEFAULT;
}
return 0;
}