Revert^2 "Fix "Free up space" not clickable issue"

4916f22ad5

Test: http://ab/I09800010279460954
Test: Build Pass
Merged-In: I36062703b7ab5c21083459616234e3a86500719b
Change-Id: Ib5d46196cf5f0326c7bb1686c609be386016f73d
This commit is contained in:
Pajace Chen
2024-05-22 05:21:21 +00:00
parent 4916f22ad5
commit 105858cb31
15 changed files with 494 additions and 35 deletions

View File

@@ -551,7 +551,7 @@ public class BatteryInfoTest {
createIntentForGetBatteryInfoTest(
ChargingType.WIRED, ChargingSpeed.REGULAR, /* batteryLevel= */ 12);
var expectedStatusLabel = "Charging";
var expectedRemainingLabel = "Fully charged by 2:00PM";
var expectedRemainingLabel = "Fully charged by";
var expectedChargeLabel = "12% - " + expectedRemainingLabel;
var currentTimeMillis = Instant.parse("2024-04-01T13:00:00Z").toEpochMilli();
@@ -572,7 +572,7 @@ public class BatteryInfoTest {
createIntentForGetBatteryInfoTest(
ChargingType.WIRED, ChargingSpeed.SLOW, /* batteryLevel= */ 18);
var expectedStatusLabel = "Charging";
var expectedRemainingLabel = "Fully charged by 3:00PM";
var expectedRemainingLabel = "Fully charged by";
var expectedChargeLabel = "18% - " + expectedRemainingLabel;
var currentTimeMillis = Instant.parse("2024-04-01T13:00:00Z").toEpochMilli();
@@ -593,7 +593,7 @@ public class BatteryInfoTest {
createIntentForGetBatteryInfoTest(
ChargingType.WIRELESS, ChargingSpeed.REGULAR, /* batteryLevel= */ 45);
var expectedStatusLabel = "Charging";
var expectedRemainingLabel = "Fully charged by 4:00PM";
var expectedRemainingLabel = "Fully charged by";
var expectedChargeLabel = "45% - " + expectedRemainingLabel;
var currentTimeMillis = Instant.parse("2024-04-01T15:00:00Z").toEpochMilli();
@@ -614,7 +614,7 @@ public class BatteryInfoTest {
createIntentForGetBatteryInfoTest(
ChargingType.DOCKED, ChargingSpeed.REGULAR, /* batteryLevel= */ 66);
var expectedStatusLabel = "Charging";
var expectedRemainingLabel = "Fully charged by 2:00PM";
var expectedRemainingLabel = "Fully charged by";
var expectedChargeLabel = "66% - " + expectedRemainingLabel;
var currentTimeMillis = Instant.parse("2021-02-09T13:00:00.00Z").toEpochMilli();
@@ -685,10 +685,10 @@ public class BatteryInfoTest {
.isEqualTo(expectedStatusLabel);
assertWithMessage("remainingLabel is incorrect")
.that(info.remainingLabel.toString())
.isEqualTo(expectedRemainingLabel);
.startsWith(expectedRemainingLabel);
assertWithMessage("chargeLabel is incorrect")
.that(info.chargeLabel.toString())
.isEqualTo(expectedChargeLabel);
.startsWith(expectedChargeLabel);
}
private static Intent createBatteryIntent(int plugged, int level, int status) {