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

Merge "Fix talkback focus on "Less than a min"" into main

Browse Source
This commit is contained in:
Xinyi Mao
2024-03-22 03:28:11 +00:00
committed by Android (Google) Code Review
parent 1a683a1007 ff3786f451
commit 7f1a96537b
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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());
}

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,
/* 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(