diff --git a/res/values/strings.xml b/res/values/strings.xml index 2d7d3eca97f..fbfad54a122 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5997,13 +5997,13 @@ App usage since last full charge to %s - Total: less than a min + Total: less than a minute - Background: less than a min + Background: less than a minute - Screen time: less than a min + Screen time: less than a minute - Less than a min + Less than a minute Total: %s diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageTimeControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageTimeControllerTest.java index 22d4ba3ab56..e8eb1260bcd 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageTimeControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageTimeControllerTest.java @@ -174,7 +174,7 @@ public final class PowerUsageTimeControllerTest { verifyAllPreferencesVisible(true); verify(mScreenTimePreference).setTimeSummary("1 min"); - verify(mBackgroundTimePreference).setTimeSummary("Less than a min"); + verify(mBackgroundTimePreference).setTimeSummary("Less than a minute"); } @Test @@ -190,7 +190,7 @@ public final class PowerUsageTimeControllerTest { /* anomalyHintText= */ null); verifyAllPreferencesVisible(true); - verify(mScreenTimePreference).setTimeSummary("Less than a min"); + verify(mScreenTimePreference).setTimeSummary("Less than a minute"); verify(mBackgroundTimePreference).setTimeSummary("2 min"); } @@ -207,8 +207,8 @@ public final class PowerUsageTimeControllerTest { /* anomalyHintText= */ null); verifyAllPreferencesVisible(true); - verify(mScreenTimePreference).setTimeSummary("Less than a min"); - verify(mBackgroundTimePreference).setTimeSummary("Less than a min"); + verify(mScreenTimePreference).setTimeSummary("Less than a minute"); + verify(mBackgroundTimePreference).setTimeSummary("Less than a minute"); } @Test @@ -258,7 +258,7 @@ public final class PowerUsageTimeControllerTest { TEST_ANOMALY_HINT_TEXT); verifyAllPreferencesVisible(true); - verify(mScreenTimePreference).setTimeSummary("Less than a min"); + verify(mScreenTimePreference).setTimeSummary("Less than a minute"); verify(mScreenTimePreference).setAnomalyHint(TEST_ANOMALY_HINT_TEXT); verify(mBackgroundTimePreference, never()).setAnomalyHint(anyString()); } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java index 5704be934e8..9dac9d5e377 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java @@ -335,7 +335,7 @@ public final class BatteryUsageBreakdownControllerTest { /* foregroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1, /* foregroundServiceUsageTimeInMs= */ 0, /* backgroundUsageTimeInMs= */ 0)); - assertThat(pref.getSummary().toString()).isEqualTo("Total: less than a min"); + assertThat(pref.getSummary().toString()).isEqualTo("Total: less than a minute"); } @Test @@ -432,7 +432,7 @@ public final class BatteryUsageBreakdownControllerTest { /* foregroundServiceUsageTimeInMs= */ 0, /* backgroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1)); assertThat(pref.getSummary().toString()) - .isEqualTo("Screen time: less than a min\nBackground: less than a min"); + .isEqualTo("Screen time: less than a minute\nBackground: less than a minute"); } private BatteryDiffEntry createBatteryDiffEntry(