Merge "Update language to comply with Android's inclusive language guidance" am: b8017c9d03 am: cbc7b156b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382480 Change-Id: Ia235f0faf642f5752e9c169c3383c37219e735a6
This commit is contained in:
@@ -384,7 +384,7 @@ public class PowerUITest extends SysuiTestCase {
|
||||
mPowerUI.mSevereWarningShownThisChargeCycle = false;
|
||||
BatteryStateSnapshotWrapper state = new BatteryStateSnapshotWrapper();
|
||||
|
||||
// sanity check to make sure we can show for a valid config
|
||||
// readiness check to make sure we can show for a valid config
|
||||
state.mBatteryLevel = 10;
|
||||
state.mTimeRemainingMillis = Duration.ofHours(2).toMillis();
|
||||
boolean shouldShow = mPowerUI.shouldShowHybridWarning(state.get());
|
||||
@@ -449,7 +449,7 @@ public class PowerUITest extends SysuiTestCase {
|
||||
mPowerUI.mSevereWarningShownThisChargeCycle = false;
|
||||
BatteryStateSnapshotWrapper state = new BatteryStateSnapshotWrapper();
|
||||
|
||||
// sanity check to make sure we can show for a valid config
|
||||
// readiness check to make sure we can show for a valid config
|
||||
state.mBatteryLevel = 1;
|
||||
state.mTimeRemainingMillis = Duration.ofMinutes(1).toMillis();
|
||||
boolean shouldShow = mPowerUI.shouldShowHybridWarning(state.get());
|
||||
@@ -572,7 +572,7 @@ public class PowerUITest extends SysuiTestCase {
|
||||
state.mIsHybrid = false;
|
||||
BatteryStateSnapshot lastState = state.get();
|
||||
|
||||
// sanity check to make sure we can show for a valid config
|
||||
// readiness check to make sure we can show for a valid config
|
||||
state.mBatteryLevel = 10;
|
||||
state.mBucket = -1;
|
||||
boolean shouldShow = mPowerUI.shouldShowLowBatteryWarning(state.get(), lastState);
|
||||
|
||||
Reference in New Issue
Block a user