PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix talkback focus on "Less than a min"

Browse Source 
- update text "min" to "minute"

Fix: 317140357
Test: manual
Change-Id: Iad1b72064f1b17c9d1ef4ed02b3d2de280d5449c
This commit is contained in:
mxyyiyi
2024-03-21 14:43:32 +08:00
parent 4e56242991
commit ff3786f451
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -5997,13 +5997,13 @@
<!-- [CHAR_LIMIT=NONE] Battery app usage section header since last full charge to slot_timestamp. Please use similar text with tc/7309909074935858949 --> <!-- [CHAR_LIMIT=NONE] Battery app usage section header since last full charge to slot_timestamp. Please use similar text with tc/7309909074935858949 -->
<string name="battery_app_usage_since_last_full_charge_to">App usage since last full charge to <xliff:g id="slot_timestamp" example="Friday 10 am">%s</xliff:g></string> <string name="battery_app_usage_since_last_full_charge_to">App usage since last full charge to <xliff:g id="slot_timestamp" example="Friday 10 am">%s</xliff:g></string>
<!-- [CHAR_LIMIT=NONE] Battery usage item for total usage time less than a minute --> <!-- [CHAR_LIMIT=NONE] Battery usage item for total usage time less than a minute -->
<string name="battery_usage_total_less_than_one_minute">Total: less than a min</string> <string name="battery_usage_total_less_than_one_minute">Total: less than a minute</string>
<!-- [CHAR_LIMIT=NONE] Battery usage item for total background time less than a minute --> <!-- [CHAR_LIMIT=NONE] Battery usage item for total background time less than a minute -->
<string name="battery_usage_background_less_than_one_minute">Background: less than a min</string> <string name="battery_usage_background_less_than_one_minute">Background: less than a minute</string>
<!-- [CHAR_LIMIT=NONE] Device screen on time less than a minute --> <!-- [CHAR_LIMIT=NONE] Device screen on time less than a minute -->
<string name="battery_usage_screen_time_less_than_one_minute">Screen time: less than a min</string> <string name="battery_usage_screen_time_less_than_one_minute">Screen time: less than a minute</string>
<!-- [CHAR_LIMIT=NONE] Power usage time less than a minute --> <!-- [CHAR_LIMIT=NONE] Power usage time less than a minute -->
<string name="power_usage_time_less_than_one_minute">Less than a min</string> <string name="power_usage_time_less_than_one_minute">Less than a minute</string>
<!-- [CHAR_LIMIT=NONE] Battery usage item for total usage time --> <!-- [CHAR_LIMIT=NONE] Battery usage item for total usage time -->
<string name="battery_usage_for_total_time">Total: <xliff:g id="time">%s</xliff:g></string> <string name="battery_usage_for_total_time">Total: <xliff:g id="time">%s</xliff:g></string>
<!-- [CHAR_LIMIT=NONE] Battery usage item for background usage time --> <!-- [CHAR_LIMIT=NONE] Battery usage item for background usage time -->

10
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageTimeControllerTest.java
View File

@@ -174,7 +174,7 @@ public final class PowerUsageTimeControllerTest {
verifyAllPreferencesVisible(true); verifyAllPreferencesVisible(true);
verify(mScreenTimePreference).setTimeSummary("1 min"); verify(mScreenTimePreference).setTimeSummary("1 min");
verify(mBackgroundTimePreference).setTimeSummary("Less than a min"); verify(mBackgroundTimePreference).setTimeSummary("Less than a minute");
} }
@Test @Test
@@ -190,7 +190,7 @@ public final class PowerUsageTimeControllerTest {
/* anomalyHintText= */ null); /* anomalyHintText= */ null);
verifyAllPreferencesVisible(true); verifyAllPreferencesVisible(true);
verify(mScreenTimePreference).setTimeSummary("Less than a min"); verify(mScreenTimePreference).setTimeSummary("Less than a minute");
verify(mBackgroundTimePreference).setTimeSummary("2 min"); verify(mBackgroundTimePreference).setTimeSummary("2 min");
} }
@@ -207,8 +207,8 @@ public final class PowerUsageTimeControllerTest {
/* anomalyHintText= */ null); /* anomalyHintText= */ null);
verifyAllPreferencesVisible(true); verifyAllPreferencesVisible(true);
verify(mScreenTimePreference).setTimeSummary("Less than a min"); verify(mScreenTimePreference).setTimeSummary("Less than a minute");
verify(mBackgroundTimePreference).setTimeSummary("Less than a min"); verify(mBackgroundTimePreference).setTimeSummary("Less than a minute");
} }
@Test @Test
@@ -258,7 +258,7 @@ public final class PowerUsageTimeControllerTest {
TEST_ANOMALY_HINT_TEXT); TEST_ANOMALY_HINT_TEXT);
verifyAllPreferencesVisible(true); verifyAllPreferencesVisible(true);
verify(mScreenTimePreference).setTimeSummary("Less than a min"); verify(mScreenTimePreference).setTimeSummary("Less than a minute");
verify(mScreenTimePreference).setAnomalyHint(TEST_ANOMALY_HINT_TEXT); verify(mScreenTimePreference).setAnomalyHint(TEST_ANOMALY_HINT_TEXT);
verify(mBackgroundTimePreference, never()).setAnomalyHint(anyString()); verify(mBackgroundTimePreference, never()).setAnomalyHint(anyString());
} }

4
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownControllerTest.java
View File

@@ -335,7 +335,7 @@ public final class BatteryUsageBreakdownControllerTest {
/* foregroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1, /* foregroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1,
/* foregroundServiceUsageTimeInMs= */ 0, /* foregroundServiceUsageTimeInMs= */ 0,
/* backgroundUsageTimeInMs= */ 0)); /* backgroundUsageTimeInMs= */ 0));
assertThat(pref.getSummary().toString()).isEqualTo("Total: less than a min"); assertThat(pref.getSummary().toString()).isEqualTo("Total: less than a minute");
} }
@Test @Test
@@ -432,7 +432,7 @@ public final class BatteryUsageBreakdownControllerTest {
/* foregroundServiceUsageTimeInMs= */ 0, /* foregroundServiceUsageTimeInMs= */ 0,
/* backgroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1)); /* backgroundUsageTimeInMs= */ DateUtils.MINUTE_IN_MILLIS - 1));
assertThat(pref.getSummary().toString()) 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( private BatteryDiffEntry createBatteryDiffEntry(