Merge "Settings - add support for Launch by Default - part 2"
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index d796570..3bc1a23 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -21,7 +21,6 @@
import android.app.Activity;
import android.app.ActivityManager;
import android.app.ApplicationErrorReport;
-import android.app.Fragment;
import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -93,9 +92,9 @@
Bundle args = new Bundle();
args.putString(PowerUsageDetail.EXTRA_TITLE, entry.name);
args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)
- ((entry.sipper.value * dischargeAmount / helper.getTotalPower()) + .5));
+ ((entry.sipper.totalPowerMah * dischargeAmount / helper.getTotalPower()) + .5));
args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)
- Math.ceil(entry.sipper.value * 100 / helper.getMaxPower()));
+ Math.ceil(entry.sipper.totalPowerMah * 100 / helper.getMaxPower()));
args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, helper.getStatsPeriod());
args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, entry.defaultPackageName);
args.putInt(PowerUsageDetail.EXTRA_ICON_ID, entry.iconId);
@@ -129,11 +128,11 @@
R.string.usage_type_video,
};
values = new double[] {
- entry.sipper.cpuTime,
- entry.sipper.cpuFgTime,
- entry.sipper.wakeLockTime,
- entry.sipper.gpsTime,
- entry.sipper.wifiRunningTime,
+ entry.sipper.cpuTimeMs,
+ entry.sipper.cpuFgTimeMs,
+ entry.sipper.wakeLockTimeMs,
+ entry.sipper.gpsTimeMs,
+ entry.sipper.wifiRunningTimeMs,
entry.sipper.mobileRxPackets,
entry.sipper.mobileTxPackets,
entry.sipper.mobileActive,
@@ -170,7 +169,7 @@
R.string.usage_type_radio_active,
};
values = new double[] {
- entry.sipper.usageTime,
+ entry.sipper.usageTimeMs,
entry.sipper.noCoveragePercent,
entry.sipper.mobileActive
};
@@ -189,10 +188,10 @@
R.string.usage_type_data_wifi_send,
};
values = new double[] {
- entry.sipper.usageTime,
- entry.sipper.cpuTime,
- entry.sipper.cpuFgTime,
- entry.sipper.wakeLockTime,
+ entry.sipper.usageTimeMs,
+ entry.sipper.cpuTimeMs,
+ entry.sipper.cpuFgTimeMs,
+ entry.sipper.wakeLockTimeMs,
entry.sipper.mobileRxPackets,
entry.sipper.mobileTxPackets,
entry.sipper.wifiRxPackets,
@@ -212,10 +211,10 @@
R.string.usage_type_data_wifi_send,
};
values = new double[] {
- entry.sipper.usageTime,
- entry.sipper.cpuTime,
- entry.sipper.cpuFgTime,
- entry.sipper.wakeLockTime,
+ entry.sipper.usageTimeMs,
+ entry.sipper.cpuTimeMs,
+ entry.sipper.cpuFgTimeMs,
+ entry.sipper.wakeLockTimeMs,
entry.sipper.mobileRxPackets,
entry.sipper.mobileTxPackets,
entry.sipper.wifiRxPackets,
@@ -254,7 +253,7 @@
R.string.usage_type_on_time
};
values = new double[] {
- entry.sipper.usageTime
+ entry.sipper.usageTimeMs
};
}
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index dbc78c2..297fe1a 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -30,7 +30,6 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.preference.Preference;
-import android.preference.PreferenceFragment;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
import android.text.TextUtils;
@@ -278,18 +277,18 @@
final int numSippers = usageList.size();
for (int i = 0; i < numSippers; i++) {
final BatterySipper sipper = usageList.get(i);
- if ((sipper.value * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP) {
+ if ((sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP) {
continue;
}
final double percentOfTotal =
- ((sipper.value / mStatsHelper.getTotalPower()) * dischargeAmount);
+ ((sipper.totalPowerMah / mStatsHelper.getTotalPower()) * dischargeAmount);
if (((int) (percentOfTotal + .5)) < 1) {
continue;
}
if (sipper.drainType == BatterySipper.DrainType.OVERCOUNTED) {
// Don't show over-counted unless it is at least 2/3 the size of
// the largest real entry, and its percent of total is more significant
- if (sipper.value < ((mStatsHelper.getMaxRealPower()*2)/3)) {
+ if (sipper.totalPowerMah < ((mStatsHelper.getMaxRealPower()*2)/3)) {
continue;
}
if (percentOfTotal < 10) {
@@ -302,7 +301,7 @@
if (sipper.drainType == BatterySipper.DrainType.UNACCOUNTED) {
// Don't show over-counted unless it is at least 1/2 the size of
// the largest real entry, and its percent of total is more significant
- if (sipper.value < (mStatsHelper.getMaxRealPower()/2)) {
+ if (sipper.totalPowerMah < (mStatsHelper.getMaxRealPower()/2)) {
continue;
}
if (percentOfTotal < 5) {
@@ -321,7 +320,7 @@
final PowerGaugePreference pref = new PowerGaugePreference(getActivity(),
badgedIcon, contentDescription, entry);
- final double percentOfMax = (sipper.value * 100) / mStatsHelper.getMaxPower();
+ final double percentOfMax = (sipper.totalPowerMah * 100) / mStatsHelper.getMaxPower();
sipper.percent = percentOfTotal;
pref.setTitle(entry.getLabel());
pref.setOrder(i + 1);