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

Bat stats: misc, percents are of battery drain.

Browse Source 
Change-Id: I6f1fb6ff33f524fe76d519a6194fad67559193bd
This commit is contained in:
Dianne Hackborn
2014-03-12 13:27:29 -07:00
parent 757450247d
commit 17452d5238
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -3606,7 +3606,7 @@
<!-- Label for power consumed when Idle --> <!-- Label for power consumed when Idle -->
<string name="power_idle" product="default">Phone idle</string> <string name="power_idle" product="default">Phone idle</string>
<!-- Label for power that we aren't able to account for --> <!-- Label for power that we aren't able to account for -->
<string name="power_unaccounted">Unknown</string> <string name="power_unaccounted">Miscellaneous</string>
<!-- Label for power that we computed too much for --> <!-- Label for power that we computed too much for -->
<string name="power_overcounted">Over-counted</string> <string name="power_overcounted">Over-counted</string>

2
src/com/android/settings/fuelgauge/PowerGaugePreference.java
View File

@@ -46,7 +46,7 @@ public class PowerGaugePreference extends Preference {
public void setPercent(double percentOfMax, double percentOfTotal) { public void setPercent(double percentOfMax, double percentOfTotal) {
mProgress = (int) Math.ceil(percentOfMax); mProgress = (int) Math.ceil(percentOfMax);
mProgressText = getContext().getResources().getString( mProgressText = getContext().getResources().getString(
R.string.percentage, (int) Math.ceil(percentOfTotal)); R.string.percentage, (int) (percentOfTotal+.5));
notifyChanged(); notifyChanged();
} }

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

@@ -238,14 +238,21 @@ public class PowerUsageSummary extends PreferenceFragment {
addNotAvailableMessage(); addNotAvailableMessage();
return; return;
} }
int dischargeAmount = mStatsType == BatteryStats.STATS_SINCE_CHARGED
? mStatsHelper.getStats().getHighDischargeAmountSinceCharge()
: (mStatsHelper.getStats().getDischargeStartLevel()
- mStatsHelper.getStats().getDischargeCurrentLevel());
if (dischargeAmount < 0) {
dischargeAmount = 0;
}
mStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, UserHandle.myUserId()); mStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, UserHandle.myUserId());
List<BatterySipper> usageList = mStatsHelper.getUsageList(); List<BatterySipper> usageList = mStatsHelper.getUsageList();
for (int i=0; i<usageList.size(); i++) { for (int i=0; i<usageList.size(); i++) {
BatterySipper sipper = usageList.get(i); BatterySipper sipper = usageList.get(i);
if ((sipper.value*60*60) < MIN_POWER_THRESHOLD) continue; if ((sipper.value*60*60) < MIN_POWER_THRESHOLD) continue;
final double percentOfTotal = final double percentOfTotal =
((sipper.value / mStatsHelper.getTotalPower()) * 100); ((sipper.value / mStatsHelper.getTotalPower()) * dischargeAmount);
if (percentOfTotal < 1) continue; if (((int)(percentOfTotal+.5)) < 1) continue;
BatteryEntry entry = new BatteryEntry(getActivity(), mHandler, mUm, sipper); BatteryEntry entry = new BatteryEntry(getActivity(), mHandler, mUm, sipper);
PowerGaugePreference pref = PowerGaugePreference pref =
new PowerGaugePreference(getActivity(), entry.getIcon(), entry); new PowerGaugePreference(getActivity(), entry.getIcon(), entry);