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

4
src/com/android/settings/backup/BackupSettingsFragment.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.backup;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -76,6 +76,6 @@ public class BackupSettingsFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.BACKUP_SETTINGS;
return SettingsEnums.BACKUP_SETTINGS;
}
}

4
src/com/android/settings/backup/PrivacySettings.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.backup;
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.search.BaseSearchIndexProvider;
@@ -34,7 +34,7 @@ public class PrivacySettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.PRIVACY;
return SettingsEnums.PRIVACY;
}
@Override

4
src/com/android/settings/backup/ToggleBackupSettingFragment.java
View File

@@ -2,6 +2,7 @@ package com.android.settings.backup;
import android.app.Dialog;
import android.app.backup.IBackupManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -17,7 +18,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -194,7 +194,7 @@ public class ToggleBackupSettingFragment extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.PRIVACY;
return SettingsEnums.PRIVACY;
}
/**