port settings over to new metrics enum

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

View File

@@ -23,7 +23,7 @@ import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.PhoneFactory;
@@ -152,6 +152,6 @@ public class ImeiInformation extends InstrumentedPreferenceActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_IMEI_INFORMATION;
return MetricsEvent.DEVICEINFO_IMEI_INFORMATION;
}
}

View File

@@ -33,7 +33,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
@@ -44,7 +44,7 @@ public class PrivateVolumeForget extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override

View File

@@ -29,7 +29,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
@@ -39,7 +39,7 @@ public class PrivateVolumeFormat extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override

View File

@@ -52,7 +52,7 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings.StorageUseActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -130,7 +130,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override

View File

@@ -28,7 +28,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
@@ -39,7 +39,7 @@ public class PrivateVolumeUnmount extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override

View File

@@ -38,7 +38,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.Preconditions;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -77,7 +77,7 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override

View File

@@ -44,7 +44,7 @@ import android.widget.TabHost.TabContentFactory;
import android.widget.TabHost.TabSpec;
import android.widget.TabWidget;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.DefaultPhoneNotifier;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
@@ -166,7 +166,7 @@ public class SimStatus extends InstrumentedPreferenceActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_SIM_STATUS;
return MetricsEvent.DEVICEINFO_SIM_STATUS;
}
@Override

View File

@@ -35,7 +35,7 @@ import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.text.TextUtils;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.ArrayUtils;
import com.android.settings.InstrumentedPreferenceActivity;
import com.android.settings.R;
@@ -211,7 +211,7 @@ public class Status extends InstrumentedPreferenceActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STATUS;
return MetricsEvent.DEVICEINFO_STATUS;
}
@Override

View File

@@ -42,7 +42,7 @@ import android.text.format.Formatter;
import android.text.format.Formatter.BytesResult;
import android.util.Log;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.dashboard.SummaryLoader;
@@ -89,7 +89,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override