Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 782d0f68 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and... 

Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and time axis labels" into lmp-preview-dev
parents 1c3203e8 a7a62c5b

res/values/strings.xml

+0 −10
Original line number Diff line number Diff line
@@ -3565,16 +3565,6 @@ 
    <string name="battery_stats_phone_signal_label">Mobile network signal</string>

    <!-- Battery usage during last unplugged period -->

    <string name="battery_stats_last_duration">@string/menu_stats_last_unplugged</string>

    <!-- [CHAR_LIMIT=5] Label for an hour time when using 24 hour mode -->

    <string name="battery_stats_hour_24_label"><xliff:g id="time">%1$d</xliff:g>:00</string>

    <!-- [CHAR_LIMIT=5] Label for an hour time when using 12 hour mode in the AM -->

    <string name="battery_stats_hour_am_label"><xliff:g id="time">%1$d</xliff:g> AM</string>

    <!-- [CHAR_LIMIT=5] Label for an hour time when using 12 hour mode in the PM -->

    <string name="battery_stats_hour_pm_label"><xliff:g id="time">%1$d</xliff:g> PM</string>

    <!-- [CHAR_LIMIT=3] Label for date of day and month (not year) when the day is shown first -->

    <string name="battery_stats_date_day_first_label"><xliff:g id="day">%1$d</xliff:g>/<xliff:g id="month">%2$d</xliff:g></string>

    <!-- [CHAR_LIMIT=3] Label for date of day and month (not year) when the month is shown first -->

    <string name="battery_stats_date_month_first_label"><xliff:g id="month">%2$d</xliff:g>/<xliff:g id="day">%1$d</xliff:g></string>

    <!-- CPU awake time title -->

    <string name="awake">Device awake time</string>

    <!-- Wifi on time -->

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

+11 −25
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import libcore.icu.LocaleData; 


import java.util.ArrayList;

import java.util.Calendar;

import java.util.Locale;



public class BatteryHistoryChart extends View {

    static final boolean DEBUG = false;
@@ -315,22 +316,11 @@ public class BatteryHistoryChart extends View { 
        final String label;

        final int width;



        TimeLabel(Context context, TextPaint paint, int x, Calendar cal, boolean use24hr) {

        TimeLabel(TextPaint paint, int x, Calendar cal, boolean use24hr) {

            this.x = x;

            if (use24hr) {

                label = context.getString(R.string.battery_stats_hour_24_label,

                        cal.get(Calendar.HOUR_OF_DAY));

            } else {

                int hour = cal.get(Calendar.HOUR);

                if (hour == 0) {

                    hour = 12;

                }

                if (cal.get(Calendar.AM_PM) == Calendar.AM) {

                    label = context.getString(R.string.battery_stats_hour_am_label, hour);

                } else {

                    label = context.getString(R.string.battery_stats_hour_pm_label, hour);

                }

            }

            final String bestFormat = DateFormat.getBestDateTimePattern(

                    Locale.getDefault(), use24hr ? "km" : "ha");

            label = DateFormat.format(bestFormat, cal).toString();

            width = (int)paint.measureText(label);

        }

    }
@@ -340,15 +330,11 @@ public class BatteryHistoryChart extends View { 
        final String label;

        final int width;



        DateLabel(Context context, TextPaint paint, int x, Calendar cal, boolean dayFirst) {

        DateLabel(TextPaint paint, int x, Calendar cal, boolean dayFirst) {

            this.x = x;

            if (dayFirst) {

                label = context.getString(R.string.battery_stats_date_day_first_label,

                        cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.MONTH));

            } else {

                label = context.getString(R.string.battery_stats_date_month_first_label,

                        cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.MONTH));

            }

            final String bestFormat = DateFormat.getBestDateTimePattern(

                    Locale.getDefault(), dayFirst ? "dM" : "Md");

            label = DateFormat.format(bestFormat, cal).toString();

            width = (int)paint.measureText(label);

        }

    }
@@ -1033,7 +1019,7 @@ public class BatteryHistoryChart extends View { 
    void addTimeLabel(Calendar cal, int levelLeft, int levelRight, boolean is24hr) {

        final long walltimeStart = mStartWallTime;

        final long walltimeChange = mEndWallTime-walltimeStart;

        mTimeLabels.add(new TimeLabel(getContext(), mTextPaint,

        mTimeLabels.add(new TimeLabel(mTextPaint,

                levelLeft + (int)(((cal.getTimeInMillis()-walltimeStart)*(levelRight-levelLeft))

                        / walltimeChange),

                cal, is24hr));
@@ -1042,7 +1028,7 @@ public class BatteryHistoryChart extends View { 
    void addDateLabel(Calendar cal, int levelLeft, int levelRight, boolean isDayFirst) {

        final long walltimeStart = mStartWallTime;

        final long walltimeChange = mEndWallTime-walltimeStart;

        mDateLabels.add(new DateLabel(getContext(), mTextPaint,

        mDateLabels.add(new DateLabel(mTextPaint,

                levelLeft + (int)(((cal.getTimeInMillis()-walltimeStart)*(levelRight-levelLeft))

                        / walltimeChange),

                cal, isDayFirst));