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

Merge "Bat stats: misc, percents are of battery drain."

Browse Source
This commit is contained in:
Dianne Hackborn
2014-03-13 17:04:58 +00:00
committed by Android (Google) Code Review
parent a28c64dd6c 17452d5238
commit fa066b9c1a
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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) {
mProgress = (int) Math.ceil(percentOfMax);
mProgressText = getContext().getResources().getString(
R.string.percentage, (int) Math.ceil(percentOfTotal));
R.string.percentage, (int) (percentOfTotal+.5));
notifyChanged();
}

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

@@ -238,14 +238,21 @@ public class PowerUsageSummary extends PreferenceFragment {
addNotAvailableMessage();
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());
List<BatterySipper> usageList = mStatsHelper.getUsageList();
for (int i=0; i<usageList.size(); i++) {
BatterySipper sipper = usageList.get(i);
if ((sipper.value*60*60) < MIN_POWER_THRESHOLD) continue;
final double percentOfTotal =
((sipper.value / mStatsHelper.getTotalPower()) * 100);
if (percentOfTotal < 1) continue;
((sipper.value / mStatsHelper.getTotalPower()) * dischargeAmount);
if (((int)(percentOfTotal+.5)) < 1) continue;
BatteryEntry entry = new BatteryEntry(getActivity(), mHandler, mUm, sipper);
PowerGaugePreference pref =
new PowerGaugePreference(getActivity(), entry.getIcon(), entry);