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

Merge "Deal with daylight savings time in battery chart."

Browse Source
This commit is contained in:
Philip P. Moltmann
2015-10-27 19:56:48 +00:00
committed by Android (Google) Code Review
parent e8244399bc 99b78b3eeb
commit 1f2ea06fc6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1118,8 +1118,13 @@ public class BatteryHistoryChart extends View {
if (startRoundTime < endRoundTime) { if (startRoundTime < endRoundTime) {
addDateLabel(calStart, mLevelLeft, mLevelRight, isDayFirst); addDateLabel(calStart, mLevelLeft, mLevelRight, isDayFirst);
Calendar calMid = Calendar.getInstance(); Calendar calMid = Calendar.getInstance();
calMid.setTimeInMillis(startRoundTime + ((endRoundTime - startRoundTime) / 2));
// The middle between two beginnings of days can be anywhere between -1 to 13
// after the beginning of the "median" day.
calMid.setTimeInMillis(startRoundTime + ((endRoundTime - startRoundTime) / 2)
+ 2 * 60 * 60 * 1000);
calMid.set(Calendar.HOUR_OF_DAY, 0); calMid.set(Calendar.HOUR_OF_DAY, 0);
calMid.set(Calendar.MINUTE, 0);
long calMidMillis = calMid.getTimeInMillis(); long calMidMillis = calMid.getTimeInMillis();
if (calMidMillis > startRoundTime && calMidMillis < endRoundTime) { if (calMidMillis > startRoundTime && calMidMillis < endRoundTime) {
addDateLabel(calMid, mLevelLeft, mLevelRight, isDayFirst); addDateLabel(calMid, mLevelLeft, mLevelRight, isDayFirst);