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/accounts/AccountDashboardFragment.java
View File

@@ -17,10 +17,10 @@ package com.android.settings.accounts;
import static android.provider.Settings.EXTRA_AUTHORITIES;
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.SettingsPreferenceFragment;
import com.android.settings.dashboard.DashboardFragment;
@@ -43,7 +43,7 @@ public class AccountDashboardFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCOUNT;
return SettingsEnums.ACCOUNT;
}
@Override

4
src/com/android/settings/accounts/AccountDetailDashboardFragment.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.accounts;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
@@ -26,7 +27,6 @@ import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
@@ -113,7 +113,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCOUNT;
return SettingsEnums.ACCOUNT;
}
@Override

1
src/com/android/settings/accounts/AccountFeatureProvider.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.accounts;
import android.accounts.Account;
import android.content.Context;
import android.content.Intent;
public interface AccountFeatureProvider {
String getAccountType();

4
src/com/android/settings/accounts/AccountSyncPreferenceController.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.accounts;
import static android.content.Intent.EXTRA_USER;
import android.accounts.Account;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.SyncAdapterType;
@@ -29,7 +30,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
@@ -66,7 +66,7 @@ public class AccountSyncPreferenceController extends AbstractPreferenceControlle
new SubSettingLauncher(mContext)
.setDestination(AccountSyncSettings.class.getName())
.setArguments(args)
.setSourceMetricsCategory( MetricsProto.MetricsEvent.ACCOUNT)
.setSourceMetricsCategory( SettingsEnums.ACCOUNT)
.setTitleRes( R.string.account_sync_title)
.launch();

6
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -20,6 +20,7 @@ import android.accounts.Account;
import android.accounts.AccountManager;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@@ -44,7 +45,6 @@ import android.view.MenuItem;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.widget.EntityHeaderController;
@@ -80,14 +80,14 @@ public class AccountSyncSettings extends AccountPreferenceBase {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCOUNTS_ACCOUNT_SYNC;
return SettingsEnums.ACCOUNTS_ACCOUNT_SYNC;
}
@Override
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case CANT_DO_ONETIME_SYNC_DIALOG:
return MetricsEvent.DIALOG_ACCOUNT_SYNC_CANNOT_ONETIME_SYNC;
return SettingsEnums.DIALOG_ACCOUNT_SYNC_CANNOT_ONETIME_SYNC;
default:
return 0;
}

4
src/com/android/settings/accounts/ChooseAccountFragment.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.accounts;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
@@ -43,7 +43,7 @@ public class ChooseAccountFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY;
return SettingsEnums.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY;
}
@Override

6
src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java
View File

@@ -19,15 +19,13 @@ import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import com.android.settings.core.BasePreferenceController;
import androidx.preference.Preference;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.slices.SliceData;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import androidx.preference.Preference;
public class CrossProfileCalendarPreferenceController extends TogglePreferenceController {
private UserHandle mManagedUser;

4
src/com/android/settings/accounts/ManagedProfileSettings.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accounts;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -26,7 +27,6 @@ import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
@@ -105,7 +105,7 @@ public class ManagedProfileSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.ACCOUNTS_WORK_PROFILE_SETTINGS;
return SettingsEnums.ACCOUNTS_WORK_PROFILE_SETTINGS;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

6
src/com/android/settings/accounts/RemoveAccountPreferenceController.java
View File

@@ -23,6 +23,7 @@ import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -37,7 +38,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen;
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 RemoveAccountPreferenceController extends AbstractPreferenceControl
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_ACCOUNT_SYNC_REMOVE;
return SettingsEnums.DIALOG_ACCOUNT_SYNC_REMOVE;
}
@Override
@@ -210,7 +210,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_ACCOUNT_SYNC_FAILED_REMOVAL;
return SettingsEnums.DIALOG_ACCOUNT_SYNC_FAILED_REMOVAL;
}
}

4
src/com/android/settings/accounts/RemoveUserFragment.java
View File

@@ -17,12 +17,12 @@
package com.android.settings.accounts;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.UserManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.users.UserDialogs;
@@ -53,6 +53,6 @@ public class RemoveUserFragment extends InstrumentedDialogFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_REMOVE_USER;
return SettingsEnums.DIALOG_REMOVE_USER;
}
}