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

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

Browse Source
This commit is contained in:
Brian Muramatsu
2012-08-20 16:58:30 -07:00
committed by Android (Google) Code Review
parent 5fdc526426 0bd54a65d6
commit e54660d8b6
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

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

3
src/com/android/settings/BatteryInfo.java
View File

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

14
src/com/android/settings/Utils.java
View File

@@ -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);