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.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
@@ -54,6 +54,6 @@ public class BatteryHistoryDetail extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.FUELGAUGE_BATTERY_HISTORY_DETAIL;
return MetricsEvent.FUELGAUGE_BATTERY_HISTORY_DETAIL;
}
}

View File

@@ -32,7 +32,7 @@ import android.provider.Settings.Global;
import android.util.Log;
import android.widget.Switch;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -65,7 +65,7 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.FUELGAUGE_BATTERY_SAVER;
return MetricsEvent.FUELGAUGE_BATTERY_SAVER;
}
@Override

View File

@@ -26,7 +26,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceGroup;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -38,7 +38,7 @@ public class InactiveApps extends SettingsPreferenceFragment implements OnPrefer
@Override
protected int getMetricsCategory() {
return MetricsLogger.FUELGAUGE_INACTIVE_APPS;
return MetricsEvent.FUELGAUGE_INACTIVE_APPS;
}
@Override

View File

@@ -42,7 +42,7 @@ import android.util.Log;
import android.view.View;
import android.widget.Button;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatterySipper.DrainType;
import com.android.internal.os.BatteryStatsHelper;
@@ -360,7 +360,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
@Override
protected int getMetricsCategory() {
return MetricsLogger.FUELGAUGE_POWER_USAGE_DETAIL;
return MetricsEvent.FUELGAUGE_POWER_USAGE_DETAIL;
}
@Override

View File

@@ -33,7 +33,7 @@ import android.util.TypedValue;
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.internal.os.BatterySipper;
import com.android.internal.os.BatterySipper.DrainType;
import com.android.internal.os.PowerProfile;
@@ -90,7 +90,7 @@ public class PowerUsageSummary extends PowerUsageBase {
@Override
protected int getMetricsCategory() {
return MetricsLogger.FUELGAUGE_POWER_USAGE_SUMMARY;
return MetricsEvent.FUELGAUGE_POWER_USAGE_SUMMARY;
}
@Override