diff options
Diffstat (limited to 'packages/SettingsLib/src/com/android/settingslib/Utils.java')
-rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/Utils.java | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index b863685b2eca..cdf0659712ea 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -228,18 +228,23 @@ public class Utils { statusString = res.getString(R.string.battery_info_status_full); } else { if (status == BatteryManager.BATTERY_STATUS_CHARGING) { - switch (batteryStatus.getChargingSpeed(context)) { - case BatteryStatus.CHARGING_FAST: - statusString = res.getString(R.string.battery_info_status_charging_fast); - break; - case BatteryStatus.CHARGING_SLOWLY: - statusString = res.getString(R.string.battery_info_status_charging_slow); - break; - default: - statusString = res.getString(R.string.battery_info_status_charging); - break; + if (batteryStatus.isPluggedInWired()) { + switch (batteryStatus.getChargingSpeed(context)) { + case BatteryStatus.CHARGING_FAST: + statusString = res.getString( + R.string.battery_info_status_charging_fast); + break; + case BatteryStatus.CHARGING_SLOWLY: + statusString = res.getString( + R.string.battery_info_status_charging_slow); + break; + default: + statusString = res.getString(R.string.battery_info_status_charging); + break; + } + } else { + statusString = res.getString(R.string.battery_info_status_charging_wireless); } - } else if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) { statusString = res.getString(R.string.battery_info_status_discharging); } else if (status == BatteryManager.BATTERY_STATUS_NOT_CHARGING) { |