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.location;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.location.SettingInjectorService;
import android.os.Bundle;
@@ -24,7 +25,6 @@ import android.provider.SearchIndexableResource;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.DashboardFragment;
@@ -69,7 +69,7 @@ public class LocationSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.LOCATION;
return SettingsEnums.LOCATION;
}
@Override

View File

@@ -23,6 +23,7 @@ import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
import android.annotation.ColorInt;
import android.app.PendingIntent;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
@@ -33,7 +34,6 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
@@ -88,7 +88,7 @@ public class LocationSlice implements CustomSliceable {
final Uri contentUri = new Uri.Builder().appendPath(KEY_LOCATION).build();
return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
LocationSettings.class.getName(), KEY_LOCATION, screenTitle,
MetricsEvent.LOCATION)
SettingsEnums.LOCATION)
.setClassName(mContext.getPackageName(), SubSettings.class.getName())
.setData(contentUri);
}

View File

@@ -16,10 +16,10 @@
package com.android.settings.location;
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;
@@ -40,7 +40,7 @@ public class ScanningSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.LOCATION_SCANNING;
return SettingsEnums.LOCATION_SCANNING;
}
@Override