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

Update name of field used from BatterySipper

Browse Source 
Change-Id: Ie7ec921d646b50826d4dfe942bc13ddfc4cd9190
This commit is contained in:
Adam Lesinski
2015-04-06 18:21:43 -07:00
parent c701a20aed
commit 0c9c85a847
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/fuelgauge/PowerUsageDetail.java
View File

@@ -21,7 +21,6 @@ import static com.android.settings.Utils.prepareCustomPreferencesList;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ApplicationErrorReport; import android.app.ApplicationErrorReport;
import android.app.Fragment;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ComponentName; import android.content.ComponentName;
@@ -93,9 +92,9 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(PowerUsageDetail.EXTRA_TITLE, entry.name); args.putString(PowerUsageDetail.EXTRA_TITLE, entry.name);
args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int) 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) 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.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, helper.getStatsPeriod());
args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, entry.defaultPackageName); args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, entry.defaultPackageName);
args.putInt(PowerUsageDetail.EXTRA_ICON_ID, entry.iconId); args.putInt(PowerUsageDetail.EXTRA_ICON_ID, entry.iconId);
@@ -129,11 +128,11 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
R.string.usage_type_video, R.string.usage_type_video,
}; };
values = new double[] { values = new double[] {
entry.sipper.cpuTime, entry.sipper.cpuTimeMs,
entry.sipper.cpuFgTime, entry.sipper.cpuFgTimeMs,
entry.sipper.wakeLockTime, entry.sipper.wakeLockTimeMs,
entry.sipper.gpsTime, entry.sipper.gpsTimeMs,
entry.sipper.wifiRunningTime, entry.sipper.wifiRunningTimeMs,
entry.sipper.mobileRxPackets, entry.sipper.mobileRxPackets,
entry.sipper.mobileTxPackets, entry.sipper.mobileTxPackets,
entry.sipper.mobileActive, entry.sipper.mobileActive,
@@ -170,7 +169,7 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
R.string.usage_type_radio_active, R.string.usage_type_radio_active,
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTime, entry.sipper.usageTimeMs,
entry.sipper.noCoveragePercent, entry.sipper.noCoveragePercent,
entry.sipper.mobileActive entry.sipper.mobileActive
}; };
@@ -189,10 +188,10 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
R.string.usage_type_data_wifi_send, R.string.usage_type_data_wifi_send,
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTime, entry.sipper.usageTimeMs,
entry.sipper.cpuTime, entry.sipper.cpuTimeMs,
entry.sipper.cpuFgTime, entry.sipper.cpuFgTimeMs,
entry.sipper.wakeLockTime, entry.sipper.wakeLockTimeMs,
entry.sipper.mobileRxPackets, entry.sipper.mobileRxPackets,
entry.sipper.mobileTxPackets, entry.sipper.mobileTxPackets,
entry.sipper.wifiRxPackets, entry.sipper.wifiRxPackets,
@@ -212,10 +211,10 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
R.string.usage_type_data_wifi_send, R.string.usage_type_data_wifi_send,
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTime, entry.sipper.usageTimeMs,
entry.sipper.cpuTime, entry.sipper.cpuTimeMs,
entry.sipper.cpuFgTime, entry.sipper.cpuFgTimeMs,
entry.sipper.wakeLockTime, entry.sipper.wakeLockTimeMs,
entry.sipper.mobileRxPackets, entry.sipper.mobileRxPackets,
entry.sipper.mobileTxPackets, entry.sipper.mobileTxPackets,
entry.sipper.wifiRxPackets, entry.sipper.wifiRxPackets,
@@ -254,7 +253,7 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
R.string.usage_type_on_time R.string.usage_type_on_time
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTime entry.sipper.usageTimeMs
}; };
} }
} }

11
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -30,7 +30,6 @@ import android.os.Message;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.preference.PreferenceGroup; import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.text.TextUtils; import android.text.TextUtils;
@@ -278,18 +277,18 @@ public class PowerUsageSummary extends InstrumentedPreferenceFragment {
final int numSippers = usageList.size(); final int numSippers = usageList.size();
for (int i = 0; i < numSippers; i++) { for (int i = 0; i < numSippers; i++) {
final BatterySipper sipper = usageList.get(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; continue;
} }
final double percentOfTotal = final double percentOfTotal =
((sipper.value / mStatsHelper.getTotalPower()) * dischargeAmount); ((sipper.totalPowerMah / mStatsHelper.getTotalPower()) * dischargeAmount);
if (((int) (percentOfTotal + .5)) < 1) { if (((int) (percentOfTotal + .5)) < 1) {
continue; continue;
} }
if (sipper.drainType == BatterySipper.DrainType.OVERCOUNTED) { if (sipper.drainType == BatterySipper.DrainType.OVERCOUNTED) {
// Don't show over-counted unless it is at least 2/3 the size of // 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 // 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; continue;
} }
if (percentOfTotal < 10) { if (percentOfTotal < 10) {
@@ -302,7 +301,7 @@ public class PowerUsageSummary extends InstrumentedPreferenceFragment {
if (sipper.drainType == BatterySipper.DrainType.UNACCOUNTED) { if (sipper.drainType == BatterySipper.DrainType.UNACCOUNTED) {
// Don't show over-counted unless it is at least 1/2 the size of // 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 // 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; continue;
} }
if (percentOfTotal < 5) { if (percentOfTotal < 5) {
@@ -321,7 +320,7 @@ public class PowerUsageSummary extends InstrumentedPreferenceFragment {
final PowerGaugePreference pref = new PowerGaugePreference(getActivity(), final PowerGaugePreference pref = new PowerGaugePreference(getActivity(),
badgedIcon, contentDescription, entry); badgedIcon, contentDescription, entry);
final double percentOfMax = (sipper.value * 100) / mStatsHelper.getMaxPower(); final double percentOfMax = (sipper.totalPowerMah * 100) / mStatsHelper.getMaxPower();
sipper.percent = percentOfTotal; sipper.percent = percentOfTotal;
pref.setTitle(entry.getLabel()); pref.setTitle(entry.getLabel());
pref.setOrder(i + 1); pref.setOrder(i + 1);