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

8
src/com/android/settings/display/NightDisplaySettings.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.display;
import android.app.Dialog;
import android.app.TimePickerDialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.os.Bundle;
@@ -26,7 +27,6 @@ import android.provider.SearchIndexableResource;
import androidx.preference.Preference;
import com.android.internal.app.ColorDisplayController;
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;
@@ -116,9 +116,9 @@ public class NightDisplaySettings extends DashboardFragment
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case DIALOG_START_TIME:
return MetricsEvent.DIALOG_NIGHT_DISPLAY_SET_START_TIME;
return SettingsEnums.DIALOG_NIGHT_DISPLAY_SET_START_TIME;
case DIALOG_END_TIME:
return MetricsEvent.DIALOG_NIGHT_DISPLAY_SET_END_TIME;
return SettingsEnums.DIALOG_NIGHT_DISPLAY_SET_END_TIME;
default:
return 0;
}
@@ -161,7 +161,7 @@ public class NightDisplaySettings extends DashboardFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.NIGHT_DISPLAY_SETTINGS;
return SettingsEnums.NIGHT_DISPLAY_SETTINGS;
}
@Override