commit b28c0c95c21bb60b8259b0cafb16754e590b4a9b
author Dianne Hackborn <hackbod@google.com> Wed Apr 13 18:17:11 2011 -0700
committer Dianne Hackborn <hackbod@google.com> Wed Apr 13 18:22:37 2011 -0700
tree d577f74f4d66a163f2510e2ffb1fe19aa9cf6eba
parent dd02c5ba9d9217c1e1c4b4e64fee8ce631f52745

A few tweaks to the battery history chart.

Change-Id: Id133267592acf7a979a625704d2d922a24f5ff41

src/com/android/settings/fuelgauge/BatteryHistoryChart.java

diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 97ebf43..13a962d 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -368,9 +368,9 @@
                     }
                     if (rec.batteryLevel != lastLevel || pos == 1) {
                         lastLevel = rec.batteryLevel;
-                        lastInteresting = pos;
-                        mHistEnd = rec.time;
                     }
+                    lastInteresting = pos;
+                    mHistEnd = rec.time;
                     aggrStates |= rec.states;
                 }
             }
@@ -438,7 +438,13 @@
                 2, getResources().getDisplayMetrics());
         if (h > (textHeight*6)) {
             mLargeMode = true;
-            mLineWidth = textHeight/2;
+            if (h > (textHeight*15)) {
+                // Plenty of room for the chart.
+                mLineWidth = textHeight/2;
+            } else {
+                // Compress lines to make more room for chart.
+                mLineWidth = textHeight/3;
+            }
             mLevelTop = textHeight + mLineWidth;
             mScreenOnPaint.setARGB(255, 32, 64, 255);
             mGpsOnPaint.setARGB(255, 32, 64, 255);
@@ -472,7 +478,8 @@
             mWifiRunningOffset = mWakeLockOffset + barOffset;
             mGpsOnOffset = mWifiRunningOffset + (mHaveWifi ? barOffset : 0);
             mPhoneSignalOffset = mGpsOnOffset + (mHaveGps ? barOffset : 0);
-            mLevelOffset = mPhoneSignalOffset + (mHavePhoneSignal ? barOffset : 0) + mLineWidth;
+            mLevelOffset = mPhoneSignalOffset + (mHavePhoneSignal ? barOffset : 0)
+                    + ((mLineWidth*3)/2);
             if (mHavePhoneSignal) {
                 mPhoneSignalChart.init(w);
             }
@@ -670,8 +677,8 @@
         if (!mBatCriticalPath.isEmpty()) {
             canvas.drawPath(mBatCriticalPath, mBatteryCriticalPaint);
         }
-        int top = height - (mHavePhoneSignal ? mPhoneSignalOffset - (mLineWidth/2) : 0);
         if (mHavePhoneSignal) {
+            int top = height-mPhoneSignalOffset - (mLineWidth/2);
             mPhoneSignalChart.draw(canvas, top, mLineWidth);
         }
         if (!mScreenOnPath.isEmpty()) {