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

14
src/com/android/settings/utils/ManagedServiceSettings.java
View File

@@ -20,6 +20,7 @@ import android.annotation.Nullable;
import android.app.ActivityManager;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageItemInfo;
@@ -32,7 +33,11 @@ import android.util.IconDrawableFactory;
import android.util.Log;
import android.view.View;
import com.android.internal.logging.nano.MetricsProto;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -42,11 +47,6 @@ import com.android.settingslib.applications.ServiceListing;
import java.util.List;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
public abstract class ManagedServiceSettings extends EmptyTextSettings {
private static final String TAG = "ManagedServiceSettings";
private final Config mConfig;
@@ -193,7 +193,7 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_SERVICE_ACCESS_WARNING;
return SettingsEnums.DIALOG_SERVICE_ACCESS_WARNING;
}
public ScaryWarningDialogFragment setServiceInfo(ComponentName cn, String label,