diff options
| author | Fan Zhang <zhfan@google.com> | 2019-01-16 13:49:47 -0800 |
|---|---|---|
| committer | Fan Zhang <zhfan@google.com> | 2019-01-17 14:55:42 -0800 |
| commit | 31b210017b59bcf90590c3832cf533d7ceb1dce6 (patch) | |
| tree | 35c3f9a2a82163cf3df229887bbdf47bf6c6ac68 /src/com/android/settings/location | |
| parent | dbaa5459b84b21c4a12268a471619f191d247e42 (diff) | |
| download | packages_apps_Settings-31b210017b59bcf90590c3832cf533d7ceb1dce6.tar.gz packages_apps_Settings-31b210017b59bcf90590c3832cf533d7ceb1dce6.tar.bz2 packages_apps_Settings-31b210017b59bcf90590c3832cf533d7ceb1dce6.zip | |
Migrate all MetricsProto enums to SettingsEnums
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
Diffstat (limited to 'src/com/android/settings/location')
| -rw-r--r-- | src/com/android/settings/location/LocationSettings.java | 4 | ||||
| -rw-r--r-- | src/com/android/settings/location/LocationSlice.java | 4 | ||||
| -rw-r--r-- | src/com/android/settings/location/ScanningSettings.java | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 78a1541170..68714281c8 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -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 diff --git a/src/com/android/settings/location/LocationSlice.java b/src/com/android/settings/location/LocationSlice.java index 6dc4241865..e2078e3a13 100644 --- a/src/com/android/settings/location/LocationSlice.java +++ b/src/com/android/settings/location/LocationSlice.java @@ -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); } diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index 86402c0934..31ec9553d3 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -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 |