diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-04-23 22:36:54 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-04-23 22:36:54 +0000 |
| commit | 81abbc1d7858f29d3344ff6f1702ece80eab8341 (patch) | |
| tree | b06d90c8277a04e4f8156d9b20d1611a974156e0 /packages/SettingsLib/src/com/android/settingslib/Utils.java | |
| parent | 857ef130fbeed8d0eb46cc1bfc9f75138f11c4e6 (diff) | |
| parent | bd33c1d7942f5aad3e313cbd447056b720d1149b (diff) | |
Merge SP1A.210412.001
Change-Id: I0e1c2f5679d5f721cd605b7da785959763311698
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) { |