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

Help talkback to read the hyphen of time frame '{day}{time}-{time}'

Browse Source 
Talkback Hover: https://screenshot.googleplex.com/6Z5KMhXRPRWrqh9
Talkback Click: https://screenshot.googleplex.com/5iYVWXE95rgH98D

Bug: 322855775
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Change-Id: I54b78e9e29c67d514c0346ddae8331450bf53f01
This commit is contained in:
mxyyiyi
2024-04-18 17:51:09 +08:00
parent 660986353e
commit 3950632041
7 changed files with 68 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
View File

@@ -383,7 +383,7 @@ public final class BatteryChartPreferenceControllerTest {
mBatteryChartPreferenceController.mDailyChartIndex = SELECTED_INDEX_ALL;
mBatteryChartPreferenceController.mHourlyChartIndex = SELECTED_INDEX_ALL;
assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(null);
assertThat(mBatteryChartPreferenceController.getSlotInformation(false)).isEqualTo(null);
assertThat(mBatteryChartPreferenceController.getBatteryLevelPercentageInfo())
.isEqualTo("Battery level percentage from 100% to 66%");
}
@@ -394,7 +394,7 @@ public final class BatteryChartPreferenceControllerTest {
mBatteryChartPreferenceController.mDailyChartIndex = 0;
mBatteryChartPreferenceController.mHourlyChartIndex = SELECTED_INDEX_ALL;
assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo(null);
assertThat(mBatteryChartPreferenceController.getSlotInformation(false)).isEqualTo(null);
assertThat(mBatteryChartPreferenceController.getBatteryLevelPercentageInfo())
.isEqualTo("Battery level percentage from 100% to 66%");
}
@@ -405,7 +405,7 @@ public final class BatteryChartPreferenceControllerTest {
mBatteryChartPreferenceController.mDailyChartIndex = 1;
mBatteryChartPreferenceController.mHourlyChartIndex = SELECTED_INDEX_ALL;
assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo("Sunday");
assertThat(mBatteryChartPreferenceController.getSlotInformation(false)).isEqualTo("Sunday");
assertThat(mBatteryChartPreferenceController.getBatteryLevelPercentageInfo())
.isEqualTo("Battery level percentage from 83% to 59%");
}
@@ -416,8 +416,10 @@ public final class BatteryChartPreferenceControllerTest {
mBatteryChartPreferenceController.mDailyChartIndex = 0;
mBatteryChartPreferenceController.mHourlyChartIndex = 2;
assertThat(mBatteryChartPreferenceController.getSlotInformation())
assertThat(mBatteryChartPreferenceController.getSlotInformation(false))
.isEqualTo("10 AM - 12 PM");
assertThat(mBatteryChartPreferenceController.getSlotInformation(true))
.isEqualTo("10 AM to 12 PM");
assertThat(mBatteryChartPreferenceController.getBatteryLevelPercentageInfo())
.isEqualTo("Battery level percentage from 97% to 95%");
}
@@ -428,8 +430,10 @@ public final class BatteryChartPreferenceControllerTest {
mBatteryChartPreferenceController.mDailyChartIndex = 1;
mBatteryChartPreferenceController.mHourlyChartIndex = 8;
assertThat(mBatteryChartPreferenceController.getSlotInformation())
assertThat(mBatteryChartPreferenceController.getSlotInformation(false))
.isEqualTo("Sunday 4 PM - 6 PM");
assertThat(mBatteryChartPreferenceController.getSlotInformation(true))
.isEqualTo("Sunday 4 PM to 6 PM");
assertThat(mBatteryChartPreferenceController.getBatteryLevelPercentageInfo())
.isEqualTo("Battery level percentage from 67% to 65%");
}
@@ -440,8 +444,10 @@ public final class BatteryChartPreferenceControllerTest {
mBatteryChartPreferenceController.mDailyChartIndex = 0;
mBatteryChartPreferenceController.mHourlyChartIndex = 0;
assertThat(mBatteryChartPreferenceController.getSlotInformation())
assertThat(mBatteryChartPreferenceController.getSlotInformation(false))
.isEqualTo("7:01 AM - 8 AM");
assertThat(mBatteryChartPreferenceController.getSlotInformation(true))
.isEqualTo("7:01 AM to 8 AM");
assertThat(mBatteryChartPreferenceController.getBatteryLevelPercentageInfo())
.isEqualTo("Battery level percentage from 100% to 99%");
}
@@ -452,7 +458,10 @@ public final class BatteryChartPreferenceControllerTest {
mBatteryChartPreferenceController.mDailyChartIndex = 0;
mBatteryChartPreferenceController.mHourlyChartIndex = 3;
assertThat(mBatteryChartPreferenceController.getSlotInformation()).isEqualTo("12 PM - now");
assertThat(mBatteryChartPreferenceController.getSlotInformation(false))
.isEqualTo("12 PM - now");
assertThat(mBatteryChartPreferenceController.getSlotInformation(true))
.isEqualTo("12 PM to now");
assertThat(mBatteryChartPreferenceController.getBatteryLevelPercentageInfo())
.isEqualTo("Battery level percentage from 95% to 66%");
}
@@ -463,8 +472,10 @@ public final class BatteryChartPreferenceControllerTest {
mBatteryChartPreferenceController.mDailyChartIndex = 0;
mBatteryChartPreferenceController.mHourlyChartIndex = 0;
assertThat(mBatteryChartPreferenceController.getSlotInformation())
assertThat(mBatteryChartPreferenceController.getSlotInformation(false))
.isEqualTo("7:01 AM - now");
assertThat(mBatteryChartPreferenceController.getSlotInformation(true))
.isEqualTo("7:01 AM to now");
assertThat(mBatteryChartPreferenceController.getBatteryLevelPercentageInfo())
.isEqualTo("Battery level percentage from 100% to 66%");
}

6
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeControllerTest.java
View File

@@ -68,7 +68,7 @@ public final class ScreenOnTimeControllerTest {
@Test
public void handleSceenOnTimeUpdated_nullScreenOnTime_hideAllPreference() {
mScreenOnTimeController.handleSceenOnTimeUpdated(
/* screenOnTime= */ null, "Friday 12:00-now");
/* screenOnTime= */ null, "Friday 12:00 to now");
verify(mRootPreference).setVisible(false);
verify(mScreenOnTimeTextPreference).setVisible(false);
@@ -84,9 +84,9 @@ public final class ScreenOnTimeControllerTest {
@Test
public void showCategoryTitle_notNull_slotTimestamp() {
mScreenOnTimeController.showCategoryTitle("Friday 12:00-now");
mScreenOnTimeController.showCategoryTitle("Friday 12:00 to now");
verify(mRootPreference).setTitle("Screen time for Friday 12:00-now");
verify(mRootPreference).setTitle("Screen time for Friday 12:00 to now");
verify(mRootPreference).setVisible(true);
}