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/enterprise/ApplicationListFragment.java
View File

@@ -17,9 +17,9 @@
package com.android.settings.enterprise;
import android.Manifest;
import android.app.settings.SettingsEnums;
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.dashboard.DashboardFragment;
@@ -73,7 +73,7 @@ public abstract class ApplicationListFragment extends DashboardFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.ENTERPRISE_PRIVACY_PERMISSIONS;
return SettingsEnums.ENTERPRISE_PRIVACY_PERMISSIONS;
}
}
@@ -102,7 +102,7 @@ public abstract class ApplicationListFragment extends DashboardFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.ENTERPRISE_PRIVACY_INSTALLED_APPS;
return SettingsEnums.ENTERPRISE_PRIVACY_INSTALLED_APPS;
}
@Override

4
src/com/android/settings/enterprise/EnterprisePrivacySettings.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.enterprise;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
@@ -39,7 +39,7 @@ public class EnterprisePrivacySettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ENTERPRISE_PRIVACY_SETTINGS;
return SettingsEnums.ENTERPRISE_PRIVACY_SETTINGS;
}
@Override

4
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
View File

@@ -16,9 +16,9 @@
package com.android.settings.enterprise;
import android.app.settings.SettingsEnums;
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -34,7 +34,7 @@ public class EnterpriseSetDefaultAppsListFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ENTERPRISE_PRIVACY_DEFAULT_APPS;
return SettingsEnums.ENTERPRISE_PRIVACY_DEFAULT_APPS;
}
@Override