Move temporary metrics constants to proto

Change-Id: I8fb3ac22df7bdc52039dd640f7696ebd32281f0b
This commit is contained in:
Jason Monk
2016-03-08 14:18:30 -05:00
parent 4695fc7e48
commit 3e19fc5600
18 changed files with 42 additions and 69 deletions

View File

@@ -37,8 +37,8 @@ import android.text.format.Formatter;
import android.util.ArraySet;
import android.view.View;
import android.widget.AdapterView;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AppHeader;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settingslib.AppItem;
@@ -287,7 +287,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
@Override
protected int getMetricsCategory() {
return InstrumentedFragment.APP_DATA_USAGE;
return MetricsEvent.APP_DATA_USAGE;
}
private AdapterView.OnItemSelectedListener mCycleListener =

View File

@@ -33,7 +33,7 @@ import android.view.View;
import android.widget.EditText;
import android.widget.NumberPicker;
import android.widget.Spinner;
import com.android.settings.InstrumentedFragment;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.net.DataUsageController;
@@ -136,7 +136,7 @@ public class BillingCycleSettings extends DataUsageBase implements
@Override
protected int getMetricsCategory() {
return InstrumentedFragment.BILLING_CYCLE;
return MetricsEvent.BILLING_CYCLE;
}
private void setPolicyLimitBytes(long limitBytes) {

View File

@@ -18,7 +18,7 @@ import android.app.Application;
import android.os.Bundle;
import android.support.v7.preference.Preference;
import android.widget.Switch;
import com.android.settings.InstrumentedFragment;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -90,7 +90,7 @@ public class DataSaverSummary extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return InstrumentedFragment.DATA_SAVER_SUMMARY;
return MetricsEvent.DATA_SAVER_SUMMARY;
}
@Override

View File

@@ -46,7 +46,7 @@ import android.view.View;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.Spinner;
import com.android.settings.InstrumentedFragment;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settingslib.AppItem;
import com.android.settingslib.net.ChartData;
@@ -110,7 +110,7 @@ public class DataUsageList extends DataUsageBase {
@Override
protected int getMetricsCategory() {
return InstrumentedFragment.DATA_USAGE_LIST;
return MetricsEvent.DATA_USAGE_LIST;
}
@Override

View File

@@ -24,7 +24,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import com.android.settings.InstrumentedFragment;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.AppStateBaseBridge;
@@ -190,7 +190,7 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return InstrumentedFragment.DATA_USAGE_UNRESTRICTED_ACCESS;
return MetricsEvent.DATA_USAGE_UNRESTRICTED_ACCESS;
}
@Override