PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate all MetricsProto enums to SettingsEnums

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/vpn2/AppManagementFragment.java
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) {