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

@@ -16,6 +16,7 @@
package com.android.settings.print;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.print.PrintJob;
@@ -24,7 +25,6 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -56,7 +56,7 @@ public class PrintJobSettingsFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.PRINT_JOB_SETTINGS;
return SettingsEnums.PRINT_JOB_SETTINGS;
}
@Override

View File

@@ -17,6 +17,7 @@
package com.android.settings.print;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -55,7 +56,6 @@ import androidx.loader.content.Loader;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -117,7 +117,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.PRINT_SERVICE_SETTINGS;
return SettingsEnums.PRINT_SERVICE_SETTINGS;
}
@Override

View File

@@ -18,6 +18,7 @@ package com.android.settings.print;
import static com.android.settings.print.PrintSettingPreferenceController.shouldShowToUser;
import android.app.settings.SettingsEnums;
import android.content.ActivityNotFoundException;
import android.content.ComponentName;
import android.content.Context;
@@ -51,7 +52,6 @@ import androidx.loader.content.Loader;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -96,7 +96,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.PRINT_SETTINGS;
return SettingsEnums.PRINT_SETTINGS;
}
@Override