diff options
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/BatteryInfo.java | 3 | ||||
| -rw-r--r-- | src/com/android/settings/Utils.java | 14 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/com/android/settings/BatteryInfo.java b/src/com/android/settings/BatteryInfo.java index d8046cf..ccad236 100644 --- a/src/com/android/settings/BatteryInfo.java +++ b/src/com/android/settings/BatteryInfo.java @@ -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; diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index a029342..777a712 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -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); |