diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 1007d8379b8e7..7baaf494771b0 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1080,14 +1080,14 @@ Battery may run out by %1$s - Less than %1$s remaining + Less than %1$s left - Less than %1$s remaining (%2$s) + Less than %1$s left (%2$s) - More than %1$s remaining (%2$s) + More than %1$s left (%2$s) - More than %1$s remaining + More than %1$s left Phone may shut down soon diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java index 342d127abd032..4b779ac4a7f50 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java @@ -137,9 +137,9 @@ public class PowerUtilTest { true /* basedOnUsage */); // shortened string should not have percentage - assertThat(info).isEqualTo("Less than 15 min remaining"); + assertThat(info).isEqualTo("Less than 15 min left"); // Add percentage to string when provided - assertThat(info2).isEqualTo("Less than 15 min remaining (10%)"); + assertThat(info2).isEqualTo("Less than 15 min left (10%)"); } @Test @@ -171,9 +171,9 @@ public class PowerUtilTest { true /* basedOnUsage */); // shortened string should not have percentage - assertThat(info).isEqualTo("More than 2 days remaining"); + assertThat(info).isEqualTo("More than 2 days left"); // Add percentage to string when provided - assertThat(info2).isEqualTo("More than 2 days remaining (10%)"); + assertThat(info2).isEqualTo("More than 2 days left (10%)"); } @Test @@ -181,7 +181,7 @@ public class PowerUtilTest { String info = PowerUtil.getBatteryTipStringFormatted(mContext, THREE_DAYS_MILLIS); - assertThat(info).isEqualTo("More than 3 days remaining"); + assertThat(info).isEqualTo("More than 3 days left"); } @Test