PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port settings over to new metrics enum

Browse Source 
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
This commit is contained in:
Chris Wren
2016-01-26 18:04:01 -05:00
parent 6a83d7537d
commit 9d1bfd1e8d
143 changed files with 328 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,8 +41,8 @@ import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
@@ -51,7 +51,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AccessiblePreferenceCategory;
import com.android.settings.DimmableIconPreference;
import com.android.settings.R;
@@ -135,7 +135,7 @@ public class AccountSettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCOUNT;
return MetricsEvent.ACCOUNT;
}
@Override

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

@@ -28,13 +28,11 @@ import android.app.Dialog;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SyncAdapterType;
import android.content.SyncInfo;
import android.content.SyncStatusInfo;
import android.content.pm.ProviderInfo;
import android.content.pm.UserInfo;
import android.graphics.Color;
import android.os.Binder;
import android.os.Bundle;
import android.os.UserHandle;
@@ -49,15 +47,14 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.google.android.collect.Lists;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.ShowAdminSupportDetailsDialog;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.google.android.collect.Lists;
import java.io.IOException;
import java.util.ArrayList;
@@ -149,7 +146,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCOUNTS_ACCOUNT_SYNC;
return MetricsEvent.ACCOUNTS_ACCOUNT_SYNC;
}
@Override

7
src/com/android/settings/accounts/ChooseAccountActivity.java
View File

@@ -32,12 +32,13 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.google.android.collect.Maps;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.CharSequences;
import com.android.settings.InstrumentedPreferenceActivity;
import com.android.settings.R;
import com.android.settings.Utils;
import com.google.android.collect.Maps;
import java.util.ArrayList;
import java.util.Collections;
@@ -89,7 +90,7 @@ public class ChooseAccountActivity extends InstrumentedPreferenceActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY;
return MetricsEvent.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY;
}
@Override

5
src/com/android/settings/accounts/ManageAccountsSettings.java
View File

@@ -45,7 +45,8 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AccountPreference;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -88,7 +89,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCOUNTS_MANAGE_ACCOUNTS;
return MetricsEvent.ACCOUNTS_MANAGE_ACCOUNTS;
}
@Override