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

@@ -17,6 +17,7 @@
package com.android.settings.vpn2;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.PackageInfo;
@@ -31,7 +32,6 @@ import android.util.Log;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.net.VpnConfig;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -57,7 +57,7 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_VPN_APP_CONFIG;
return SettingsEnums.DIALOG_VPN_APP_CONFIG;
}
public interface Listener {

View File

@@ -20,6 +20,7 @@ import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
import android.annotation.NonNull;
import android.app.AppOpsManager;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
@@ -40,7 +41,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.net.VpnConfig;
import com.android.internal.util.ArrayUtils;
import com.android.settings.R;
@@ -173,7 +173,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.VPN;
return SettingsEnums.VPN;
}
private boolean onForgetVpnClick() {
@@ -335,7 +335,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_VPN_CANNOT_CONNECT;
return SettingsEnums.DIALOG_VPN_CANNOT_CONNECT;
}
public static void show(AppManagementFragment parent, String vpnLabel) {

View File

@@ -17,6 +17,7 @@
package com.android.settings.vpn2;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.net.ConnectivityManager;
@@ -33,7 +34,6 @@ import android.widget.Toast;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnProfile;
import com.android.settings.R;
@@ -61,7 +61,7 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_LEGACY_VPN_CONFIG;
return SettingsEnums.DIALOG_LEGACY_VPN_CONFIG;
}
public static void show(VpnSettings parent, VpnProfile profile, boolean edit, boolean exists) {

View File

@@ -16,13 +16,13 @@
package com.android.settings.vpn2;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -36,7 +36,7 @@ public class ConfirmLockdownFragment extends InstrumentedDialogFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_VPN_REPLACE_EXISTING;
return SettingsEnums.DIALOG_VPN_REPLACE_EXISTING;
}
private static final String ARG_REPLACING = "replacing";

View File

@@ -22,6 +22,7 @@ import android.annotation.UiThread;
import android.annotation.WorkerThread;
import android.app.Activity;
import android.app.AppOpsManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
@@ -54,7 +55,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnProfile;
@@ -114,7 +114,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements
@Override
public int getMetricsCategory() {
return MetricsEvent.VPN;
return SettingsEnums.VPN;
}
@Override