diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 4bf4f4d46c289..f92cc8eda2680 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1134,6 +1134,8 @@ Charging slowly Charging wirelessly + + Charging Dock Not charging diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index feb4212035bc1..b9c4030d9d0ee 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -239,6 +239,8 @@ public class Utils { statusString = res.getString(R.string.battery_info_status_charging); break; } + } else if (batteryStatus.isPluggedInDock()) { + statusString = res.getString(R.string.battery_info_status_charging_dock); } else { statusString = res.getString(R.string.battery_info_status_charging_wireless); } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java index 09b2a2e73c5b4..336cdd3f259f4 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java @@ -364,6 +364,17 @@ public class UtilsTest { resources.getString(R.string.battery_info_status_charging)); } + @Test + public void getBatteryStatus_chargingDock_returnDockChargingString() { + final Intent intent = new Intent(); + intent.putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING); + intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_DOCK); + final Resources resources = mContext.getResources(); + + assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ false)).isEqualTo( + resources.getString(R.string.battery_info_status_charging_dock)); + } + @Test public void getBatteryStatus_chargingWireless_returnWirelessChargingString() { final Intent intent = new Intent();