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/datetime/timezone/FixedOffsetPicker.java
View File

@@ -16,9 +16,9 @@
package com.android.settings.datetime.timezone;
import android.app.settings.SettingsEnums;
import android.icu.util.TimeZone;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.datetime.timezone.model.TimeZoneData;
@@ -45,7 +45,7 @@ public class FixedOffsetPicker extends BaseTimeZoneInfoPicker {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_ZONE_PICKER_FIXED_OFFSET;
return SettingsEnums.SETTINGS_ZONE_PICKER_FIXED_OFFSET;
}
@Override

4
src/com/android/settings/datetime/timezone/RegionSearchPicker.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.datetime.timezone;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.icu.text.Collator;
import android.icu.text.LocaleDisplayNames;
@@ -25,7 +26,6 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
@@ -54,7 +54,7 @@ public class RegionSearchPicker extends BaseTimeZonePicker {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_ZONE_PICKER_REGION;
return SettingsEnums.SETTINGS_ZONE_PICKER_REGION;
}
@Override

4
src/com/android/settings/datetime/timezone/RegionZonePicker.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.datetime.timezone;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.icu.text.Collator;
import android.icu.text.LocaleDisplayNames;
@@ -26,7 +27,6 @@ import android.util.Log;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.datetime.timezone.model.FilteredCountryTimeZones;
import com.android.settings.datetime.timezone.model.TimeZoneData;
@@ -55,7 +55,7 @@ public class RegionZonePicker extends BaseTimeZoneInfoPicker {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_ZONE_PICKER_TIME_ZONE;
return SettingsEnums.SETTINGS_ZONE_PICKER_TIME_ZONE;
}
@Override

4
src/com/android/settings/datetime/timezone/TimeZoneSettings.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.datetime.timezone;
import android.app.Activity;
import android.app.AlarmManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -31,7 +32,6 @@ import android.view.MenuItem;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceCategory;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
@@ -75,7 +75,7 @@ public class TimeZoneSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.ZONE_PICKER;
return SettingsEnums.ZONE_PICKER;
}
@Override