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/users/AppRestrictionsFragment.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.users;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -53,7 +54,6 @@ import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceViewHolder;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
@@ -244,7 +244,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
@Override
public int getMetricsCategory() {
return MetricsEvent.USERS_APP_RESTRICTIONS;
return SettingsEnums.USERS_APP_RESTRICTIONS;
}
@Override

4
src/com/android/settings/users/AutoSyncDataPreferenceController.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.users;
import android.app.ActivityManager;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
@@ -31,7 +32,6 @@ import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -147,7 +147,7 @@ public class AutoSyncDataPreferenceController extends AbstractPreferenceControll
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_CONFIRM_AUTO_SYNC_CHANGE;
return SettingsEnums.DIALOG_CONFIRM_AUTO_SYNC_CHANGE;
}
@Override

4
src/com/android/settings/users/OwnerInfoSettings.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.users;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;
@@ -29,7 +30,6 @@ import android.widget.EditText;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -96,6 +96,6 @@ public class OwnerInfoSettings extends InstrumentedDialogFragment implements OnC
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_OWNER_INFO_SETTINGS;
return SettingsEnums.DIALOG_OWNER_INFO_SETTINGS;
}
}

6
src/com/android/settings/users/RestrictedProfileSettings.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.users;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.UserInfo;
@@ -26,7 +27,6 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -138,9 +138,9 @@ public class RestrictedProfileSettings extends AppRestrictionsFragment
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case DIALOG_ID_EDIT_USER_INFO:
return MetricsProto.MetricsEvent.DIALOG_USER_EDIT;
return SettingsEnums.DIALOG_USER_EDIT;
case DIALOG_CONFIRM_REMOVE:
return MetricsProto.MetricsEvent.DIALOG_USER_REMOVE;
return SettingsEnums.DIALOG_USER_REMOVE;
default:
return 0;
}

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;
}

22
src/com/android/settings/users/UserSettings.java
View File

@@ -20,6 +20,7 @@ import android.app.Activity;
import android.app.ActivityManager;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
@@ -56,7 +57,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.UserIcons;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
@@ -205,7 +205,7 @@ public class UserSettings extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.USER;
return SettingsEnums.USER;
}
@Override
@@ -702,23 +702,23 @@ public class UserSettings extends SettingsPreferenceFragment
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case DIALOG_CONFIRM_REMOVE:
return MetricsEvent.DIALOG_USER_REMOVE;
return SettingsEnums.DIALOG_USER_REMOVE;
case DIALOG_USER_CANNOT_MANAGE:
return MetricsEvent.DIALOG_USER_CANNOT_MANAGE;
return SettingsEnums.DIALOG_USER_CANNOT_MANAGE;
case DIALOG_ADD_USER:
return MetricsEvent.DIALOG_USER_ADD;
return SettingsEnums.DIALOG_USER_ADD;
case DIALOG_SETUP_USER:
return MetricsEvent.DIALOG_USER_SETUP;
return SettingsEnums.DIALOG_USER_SETUP;
case DIALOG_SETUP_PROFILE:
return MetricsEvent.DIALOG_USER_SETUP_PROFILE;
return SettingsEnums.DIALOG_USER_SETUP_PROFILE;
case DIALOG_CHOOSE_USER_TYPE:
return MetricsEvent.DIALOG_USER_CHOOSE_TYPE;
return SettingsEnums.DIALOG_USER_CHOOSE_TYPE;
case DIALOG_NEED_LOCKSCREEN:
return MetricsEvent.DIALOG_USER_NEED_LOCKSCREEN;
return SettingsEnums.DIALOG_USER_NEED_LOCKSCREEN;
case DIALOG_CONFIRM_EXIT_GUEST:
return MetricsEvent.DIALOG_USER_CONFIRM_EXIT_GUEST;
return SettingsEnums.DIALOG_USER_CONFIRM_EXIT_GUEST;
case DIALOG_USER_PROFILE_EDITOR:
return MetricsEvent.DIALOG_USER_EDIT_PROFILE;
return SettingsEnums.DIALOG_USER_EDIT_PROFILE;
default:
return 0;
}