Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance" am: b8017c9d03 am: cbc7b156b2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382480

Change-Id: Ia235f0faf642f5752e9c169c3383c37219e735a6
This commit is contained in:
Puma Hsu
2020-08-07 03:07:01 +00:00
committed by Automerger Merge Worker
parent 724d8f1740 cbc7b156b2
commit 185d02ec5d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/tests/src/com/android/systemui/power/PowerUITest.java
View File

@@ -384,7 +384,7 @@ public class PowerUITest extends SysuiTestCase {
mPowerUI.mSevereWarningShownThisChargeCycle = false; mPowerUI.mSevereWarningShownThisChargeCycle = false;
BatteryStateSnapshotWrapper state = new BatteryStateSnapshotWrapper(); 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.mBatteryLevel = 10;
state.mTimeRemainingMillis = Duration.ofHours(2).toMillis(); state.mTimeRemainingMillis = Duration.ofHours(2).toMillis();
boolean shouldShow = mPowerUI.shouldShowHybridWarning(state.get()); boolean shouldShow = mPowerUI.shouldShowHybridWarning(state.get());
@@ -449,7 +449,7 @@ public class PowerUITest extends SysuiTestCase {
mPowerUI.mSevereWarningShownThisChargeCycle = false; mPowerUI.mSevereWarningShownThisChargeCycle = false;
BatteryStateSnapshotWrapper state = new BatteryStateSnapshotWrapper(); 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.mBatteryLevel = 1;
state.mTimeRemainingMillis = Duration.ofMinutes(1).toMillis(); state.mTimeRemainingMillis = Duration.ofMinutes(1).toMillis();
boolean shouldShow = mPowerUI.shouldShowHybridWarning(state.get()); boolean shouldShow = mPowerUI.shouldShowHybridWarning(state.get());
@@ -572,7 +572,7 @@ public class PowerUITest extends SysuiTestCase {
state.mIsHybrid = false; state.mIsHybrid = false;
BatteryStateSnapshot lastState = state.get(); 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.mBatteryLevel = 10;
state.mBucket = -1; state.mBucket = -1;
boolean shouldShow = mPowerUI.shouldShowLowBatteryWarning(state.get(), lastState); boolean shouldShow = mPowerUI.shouldShowLowBatteryWarning(state.get(), lastState);