diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index a7970668124b3..1424f9ebdf596 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1066,8 +1066,8 @@ Should last until about %1$s Until %1$s - - Extend battery life past %1$s + + Battery may run out by %1$s Less than %1$s remaining diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java index 7046d234904b1..0a70f72518d42 100644 --- a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java @@ -119,7 +119,7 @@ public class PowerUtil { return null; } if (drainTimeMs <= ONE_DAY_MILLIS) { - return context.getString(R.string.power_suggestion_extend_battery, + return context.getString(R.string.power_suggestion_battery_run_out, getDateTimeStringFromMs(context, drainTimeMs)); } else { return getMoreThanOneDayShortString(context, drainTimeMs, 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 ed308c8d6f6a6..342d127abd032 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 @@ -42,7 +42,7 @@ public class PowerUtilTest { private static final long THIRTY_HOURS_MILLIS = Duration.ofHours(30).toMillis(); private static final String NORMAL_CASE_EXPECTED_PREFIX = "Should last until about"; private static final String ENHANCED_SUFFIX = " based on your usage"; - private static final String EXTEND_PREFIX = "Extend battery life past"; + private static final String BATTERY_RUN_OUT_PREFIX = "Battery may run out by"; // matches a time (ex: '1:15 PM', '2 AM', '23:00') private static final String TIME_OF_DAY_REGEX = " (\\d)+:?(\\d)* ((AM)*)|((PM)*)"; // matches a percentage with parenthesis (ex: '(10%)') @@ -189,9 +189,9 @@ public class PowerUtilTest { String info = PowerUtil.getBatteryTipStringFormatted(mContext, SEVENTEEN_MIN_MILLIS); - // ex: Extend battery life past 1:15 PM + // ex: Battery may run out by 1:15 PM assertThat(info).containsMatch(Pattern.compile( - EXTEND_PREFIX + TIME_OF_DAY_REGEX)); + BATTERY_RUN_OUT_PREFIX + TIME_OF_DAY_REGEX)); } @Test