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

Commit e54660d8 authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android (Google) Code Review
Browse files

Merge "display wireless charging status" into jb-mr1-dev

parents 5fdc5264 0bd54a65

res/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -176,8 +176,10 @@ 
    <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>

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

    <string name="battery_info_status_discharging">Discharging</string>

    <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 -->

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

    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -187,6 +189,7 @@ 
    <string name="battery_info_power_unplugged">Unplugged</string>

    <string name="battery_info_power_ac">AC</string>

    <string name="battery_info_power_usb">USB</string>

    <string name="battery_info_power_wireless">wireless</string>

    <string name="battery_info_power_ac_usb">AC+USB</string>

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

src/com/android/settings/BatteryInfo.java

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ public class BatteryInfo extends Activity { 
                    case BatteryManager.BATTERY_PLUGGED_USB:

                        mPower.setText(getString(R.string.battery_info_power_usb));

                        break;

                    case BatteryManager.BATTERY_PLUGGED_WIRELESS:

                        mPower.setText(getString(R.string.battery_info_power_wireless));

                        break;

                    case (BatteryManager.BATTERY_PLUGGED_AC|BatteryManager.BATTERY_PLUGGED_USB):

                        mPower.setText(getString(R.string.battery_info_power_ac_usb));

                        break;

src/com/android/settings/Utils.java

+9 −5
Original line number Diff line number Diff line
@@ -371,11 +371,15 @@ public class Utils { 
        if (status == BatteryManager.BATTERY_STATUS_CHARGING) {

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

            if (plugType > 0) {

                statusString = statusString

                        + " "

                        + res.getString((plugType == BatteryManager.BATTERY_PLUGGED_AC)

                                ? R.string.battery_info_status_charging_ac

                                : R.string.battery_info_status_charging_usb);

                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 {

                    resId = R.string.battery_info_status_charging_wireless;

                }

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

            }

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

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