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

Small improvements to bettery level graphing.

Browse Source 
Deal with data that doesn't start with updates; don't try to
make lines horizontal (a battery doesn't change is a battery
that is dead!).

Change-Id: I10a7938a04cc5ed5e92a55857851d8d70b64c3b6
This commit is contained in:
Dianne Hackborn
2010-06-21 14:42:49 -07:00
parent 2f92074b4a
commit b9b7e5c863
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/fuelgauge/BatteryHistoryChart.java
View File

@@ -58,6 +58,7 @@ public class BatteryHistoryChart extends View {
int mDurationStringWidth;
int mNumHist;
BatteryStats.HistoryItem mHistFirst;
long mHistStart;
long mHistEnd;
int mBatLow;
@@ -230,10 +231,7 @@ public class BatteryHistoryChart extends View {
durationString);
BatteryStats.HistoryItem rec = stats.getHistory();
if (rec != null) {
mHistStart = rec.time;
mBatLow = mBatHigh = rec.batteryLevel;
}
mHistFirst = null;
int pos = 0;
int lastInteresting = 0;
byte lastLevel = -1;
@@ -241,11 +239,16 @@ public class BatteryHistoryChart extends View {
mBatHigh = 100;
while (rec != null) {
pos++;
if (rec.cmd == HistoryItem.CMD_UPDATE && (rec.batteryLevel != lastLevel
|| pos == 1)) {
lastLevel = rec.batteryLevel;
lastInteresting = pos;
mHistEnd = rec.time;
if (rec.cmd == HistoryItem.CMD_UPDATE) {
if (mHistFirst == null) {
mHistFirst = rec;
mHistStart = rec.time;
}
if (rec.batteryLevel != lastLevel || pos == 1) {
lastLevel = rec.batteryLevel;
lastInteresting = pos;
mHistEnd = rec.time;
}
}
rec = rec.next;
}
@@ -278,7 +281,7 @@ public class BatteryHistoryChart extends View {
final int batLow = mBatLow;
final int batChange = mBatHigh-mBatLow;
BatteryStats.HistoryItem rec = mStats.getHistory();
BatteryStats.HistoryItem rec = mHistFirst;
int x = 0, y = 0, lastX = -1, lastY = -1, lastBatX = -1, lastBatY = -1;
byte lastBatValue = 0;
int i = 0, num = 0;
@@ -306,15 +309,6 @@ public class BatteryHistoryChart extends View {
lastBatX = x;
lastBatY = y;
} else {
if (lastBatX >= 0) {
// Level stayed the same up to here; put in line.
mBatLevelPath.lineTo(lastBatX, lastBatY);
mBatLevelX[mNumBatLevel] = lastBatX;
mBatLevelY[mNumBatLevel] = lastBatY;
mBatLevelValue[mNumBatLevel] = lastBatValue;
mNumBatLevel++;
num++;
}
mBatLevelPath.lineTo(x, y);
mBatLevelX[mNumBatLevel] = x;
mBatLevelY[mNumBatLevel] = y;