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

Commit cbc7b156 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" am: b8017c9d

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

Change-Id: Ia0c937717d130ea844bab629c744e32201991610
parents fc546021 b8017c9d
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -363,7 +363,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());
@@ -428,7 +428,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());
@@ -551,7 +551,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);