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

Commit 7e315ee5 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Update battery use chart to better match new mocks."

parents 347d195a 5a9ace3a

res/layout/preference_batteryhistory.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    android:gravity="center_vertical"

    android:id="@+android:id/battery_history_chart"

    android:paddingEnd="?android:attr/scrollbarSize"

    android:textAppearance="?android:attr/textAppearanceMedium"

    android:textAppearance="?android:attr/textAppearanceSmall"

    app:headerAppearance="?android:attr/textAppearanceMedium"

    android:shadowRadius="4"

    android:shadowColor="?android:attr/colorBackground"

res/values/strings.xml

+17 −7
Original line number Diff line number Diff line
@@ -185,14 +185,14 @@ 


    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->

    <string name="battery_info_status_unknown">Unknown</string>

    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->

    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging from an unknown source.  -->

    <string name="battery_info_status_charging">Charging</string>

    <!-- Battery Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->

    <string name="battery_info_status_charging_ac">(AC)</string>

    <!-- Battery Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->

    <string name="battery_info_status_charging_usb">(USB)</string>

    <!-- Battery Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->

    <string name="battery_info_status_charging_wireless">(wireless)</string>

    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging on AC.  -->

    <string name="battery_info_status_charging_ac">Charging on AC</string>

    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over USB.  -->

    <string name="battery_info_status_charging_usb">Charging over USB</string>

    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over a wireless connection.  -->

    <string name="battery_info_status_charging_wireless">Charging wirelessly</string>

    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->

    <string name="battery_info_status_discharging">Not charging</string>

    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -3551,6 +3551,16 @@ 
    <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/Utils.java

+10 −11
Original line number Diff line number Diff line
@@ -312,18 +312,17 @@ public class Utils { 
                BatteryManager.BATTERY_STATUS_UNKNOWN);

        String statusString;

        if (status == BatteryManager.BATTERY_STATUS_CHARGING) {

            statusString = res.getString(R.string.battery_info_status_charging);

            if (plugType > 0) {

            int resId;

            if (plugType == BatteryManager.BATTERY_PLUGGED_AC) {

                resId = R.string.battery_info_status_charging_ac;

            } else if (plugType == BatteryManager.BATTERY_PLUGGED_USB) {

                resId = R.string.battery_info_status_charging_usb;

                } else {

            } else if (plugType == BatteryManager.BATTERY_PLUGGED_WIRELESS) {

                resId = R.string.battery_info_status_charging_wireless;

            } else {

                resId = R.string.battery_info_status_charging;

            }

                statusString = statusString + " " + res.getString(resId);

            }

            statusString = res.getString(resId);

        } else if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) {

            statusString = res.getString(R.string.battery_info_status_discharging);

        } else if (status == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {

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

+528 −143

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.os.BatteryManager;

import android.os.BatteryStats;

import android.os.Bundle;

import android.os.Handler;