Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 185d02ec authored by Puma Hsu's avatar Puma Hsu Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: b8017c9d am: cbc7b156

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

Change-Id: Ia235f0faf642f5752e9c169c3383c37219e735a6
parents 724d8f17 cbc7b156

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

+3 −3
Original line number Diff line number Diff line
@@ -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);