diff options
| author | Brian Muramatsu <btmura@google.com> | 2012-08-20 16:58:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-20 16:58:31 -0700 |
| commit | e54660d8b66e5c3aebbeefbb727386602714c621 (patch) | |
| tree | a827e250feb692c9ac75d78dc848f64e1567f1b7 | |
| parent | 5fdc526426f6250bda522235a6db56548c89cb0a (diff) | |
| parent | 0bd54a65d62d726dbdccab21bea96bf5eac83c0a (diff) | |
| download | packages_apps_settings-e54660d8b66e5c3aebbeefbb727386602714c621.zip packages_apps_settings-e54660d8b66e5c3aebbeefbb727386602714c621.tar.gz packages_apps_settings-e54660d8b66e5c3aebbeefbb727386602714c621.tar.bz2 | |
Merge "display wireless charging status" into jb-mr1-dev
| -rw-r--r-- | res/values/strings.xml | 5 | ||||
| -rw-r--r-- | src/com/android/settings/BatteryInfo.java | 3 | ||||
| -rw-r--r-- | src/com/android/settings/Utils.java | 14 |
3 files changed, 16 insertions, 6 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 2cf5117..3db7edc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -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> 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); |