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

11
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.users;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.UserInfo;
@@ -27,8 +28,6 @@ import android.os.UserManager;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -70,7 +69,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.USER_DETAILS;
return SettingsEnums.USER_DETAILS;
}
@Override
@@ -198,11 +197,11 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case DIALOG_CONFIRM_REMOVE:
return MetricsProto.MetricsEvent.DIALOG_USER_REMOVE;
return SettingsEnums.DIALOG_USER_REMOVE;
case DIALOG_CONFIRM_ENABLE_CALLING:
return MetricsProto.MetricsEvent.DIALOG_USER_ENABLE_CALLING;
return SettingsEnums.DIALOG_USER_ENABLE_CALLING;
case DIALOG_CONFIRM_ENABLE_CALLING_AND_SMS:
return MetricsProto.MetricsEvent.DIALOG_USER_ENABLE_CALLING_AND_SMS;
return SettingsEnums.DIALOG_USER_ENABLE_CALLING_AND_SMS;
default:
return 0;
}