From 18083b1eb770a2a6d543cfa4abb17ae2c121d836 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 22 Jan 2014 14:18:39 -0800 Subject: Battery: report calculated power, tweak signal strength colors. BatteryHistoryHelper now computes the total power to be the total including the unaccounted, so we don't go > 100%. However for the unaccounted/over-counted details, we want to report the actual computed amount. Use a new API to do this. Also tweak the signal strength colors so that the "no signal" state is stronger, by being reddish instead of bright yellow. Change-Id: I6af9fbcce8c3324883db0184f7ac215cb41b6230 --- src/com/android/settings/fuelgauge/BatteryHistoryChart.java | 4 ++-- src/com/android/settings/fuelgauge/PowerUsageDetail.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java index dfed5c4..25435ef 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java @@ -193,8 +193,8 @@ public class BatteryHistoryChart extends View { mWifiRunningPaint.setStyle(Paint.Style.STROKE); mWakeLockPaint.setStyle(Paint.Style.STROKE); mPhoneSignalChart.setColors(new int[] { - 0x00000000, 0xffa00000, 0xffa0a000, 0xff808020, - 0xff808040, 0xff808060, 0xff008000 + 0x00000000, 0xffa00000, 0xffa07000, 0xffa0a000, + 0xff80a000, 0xff409000, 0xff008000 }); mTextPaint.density = getResources().getDisplayMetrics().density; diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index 6a3a31b..01bd4f3 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -223,7 +223,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener }; values = new double[] { helper.getPowerProfile().getBatteryCapacity(), - helper.getTotalPower(), + helper.getComputedPower(), helper.getMinDrainedPower(), helper.getMaxDrainedPower(), }; -- cgit v1.1