diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 8965144e73513..014a033a4c015 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -1160,6 +1160,8 @@
Connected, not charging
Charged
+
+ Fully Charged
Controlled by admin
diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java
index 4b7fb1b4698ca..19114cf147e4b 100644
--- a/packages/SettingsLib/src/com/android/settingslib/Utils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java
@@ -207,7 +207,9 @@ public class Utils {
final BatteryStatus batteryStatus = new BatteryStatus(batteryChangedIntent);
if (batteryStatus.isCharged()) {
- statusString = res.getString(R.string.battery_info_status_full);
+ statusString = res.getString(compactStatus
+ ? R.string.battery_info_status_full_charged
+ : R.string.battery_info_status_full);
} else {
if (status == BatteryManager.BATTERY_STATUS_CHARGING) {
if (compactStatus) {
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 4e381749b8a66..09b2a2e73c5b4 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java
@@ -324,6 +324,15 @@ public class UtilsTest {
resources.getString(R.string.battery_info_status_full));
}
+ @Test
+ public void getBatteryStatus_statusIsFullAndUseCompactStatus_returnFullyChargedString() {
+ final Intent intent = new Intent().putExtra(BatteryManager.EXTRA_LEVEL, 100);
+ final Resources resources = mContext.getResources();
+
+ assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ true)).isEqualTo(
+ resources.getString(R.string.battery_info_status_full_charged));
+ }
+
@Test
public void getBatteryStatus_batteryLevelIs100_returnFullString() {
final Intent intent = new Intent().putExtra(BatteryManager.EXTRA_STATUS,
@@ -334,6 +343,16 @@ public class UtilsTest {
resources.getString(R.string.battery_info_status_full));
}
+ @Test
+ public void getBatteryStatus_batteryLevelIs100AndUseCompactStatus_returnFullyString() {
+ final Intent intent = new Intent().putExtra(BatteryManager.EXTRA_STATUS,
+ BatteryManager.BATTERY_STATUS_FULL);
+ final Resources resources = mContext.getResources();
+
+ assertThat(Utils.getBatteryStatus(mContext, intent, /* compactStatus= */ true)).isEqualTo(
+ resources.getString(R.string.battery_info_status_full_charged));
+ }
+
@Test
public void getBatteryStatus_batteryLevel99_returnChargingString() {
final Intent intent = new Intent();