Merge "Battery: report calculated power, tweak signal strength colors."

This commit is contained in:
Dianne Hackborn
2014-01-24 02:02:08 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 3 deletions

View File

@@ -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;

View File

@@ -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(),
};