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

Commit c25604ba authored by Salvador Martinez's avatar Salvador Martinez
Browse files

Update severe (5%/1 hour) warning to send through battery saver 

Now that battery saver is sticky this notification never shows
and we are getting reports from people that the notification
they were expecting never showed up. It turns out that a lot
of these were due to people not realizing battery saver was on.
To remedy the worst case situation (your phone is about to die
soon but no 15%/3 hour notification came up) we should always
show the severe warning even if battery saver is on. This only
affects the hybrid warning, not the legacy percentage based
version.

Test: unit tests
Bug: 111596093
Change-Id: I92453b68b6ee8aad8f862147c877f4e789afc55c
parent db0c85b1

packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java

+6 −3
Original line number Diff line number Diff line
@@ -266,9 +266,12 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
                || mEstimate.estimateMillis < mSevereWarningThreshold) {

            nb.setColor(Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorError));

        }



        if (!mPowerMan.isPowerSaveMode()) {

            nb.addAction(0,

                    mContext.getString(R.string.battery_saver_start_action),

                    pendingBroadcast(ACTION_START_SAVER));

        }

        nb.setOnlyAlertOnce(!mPlaySound);

        mPlaySound = false;

        SystemUI.overrideNotificationAppName(mContext, nb, false);

packages/SystemUI/src/com/android/systemui/power/PowerUI.java

+6 −5
Original line number Diff line number Diff line
@@ -333,10 +333,11 @@ public class PowerUI extends SystemUI { 
    @VisibleForTesting

    boolean shouldDismissLowBatteryWarning(boolean plugged, int oldBucket, int bucket,

            long timeRemaining, boolean isPowerSaver) {

        final boolean hybridWouldDismiss = mEnhancedEstimates.isHybridNotificationEnabled()

        final boolean hybridEnabled = mEnhancedEstimates.isHybridNotificationEnabled();

        final boolean hybridWouldDismiss = hybridEnabled

                && timeRemaining > mEnhancedEstimates.getLowWarningThreshold();

        final boolean standardWouldDismiss = (bucket > oldBucket && bucket > 0);

        return isPowerSaver

        return (isPowerSaver && !hybridEnabled)

                || plugged

                || (standardWouldDismiss && (!mEnhancedEstimates.isHybridNotificationEnabled()

                        || hybridWouldDismiss));
@@ -344,14 +345,14 @@ public class PowerUI extends SystemUI { 


    private boolean isEnhancedTrigger(boolean plugged, long timeRemaining, boolean isPowerSaver,

            int batteryStatus) {

        if (plugged || isPowerSaver || batteryStatus == BatteryManager.BATTERY_STATUS_UNKNOWN) {

        if (plugged || batteryStatus == BatteryManager.BATTERY_STATUS_UNKNOWN) {

            return false;

        }

        int warnLevel = mLowBatteryReminderLevels[0];

        int critLevel = mLowBatteryReminderLevels[1];



        // Only show the low warning once per charge cycle

        final boolean canShowWarning = !mLowWarningShownThisChargeCycle

        // Only show the low warning once per charge cycle & no battery saver

        final boolean canShowWarning = !mLowWarningShownThisChargeCycle && !isPowerSaver

                && (timeRemaining < mEnhancedEstimates.getLowWarningThreshold()

                        || mBatteryLevel <= warnLevel);

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

+16 −2
Original line number Diff line number Diff line
@@ -323,9 +323,9 @@ public class PowerUITest extends SysuiTestCase { 
    }



    @Test

    public void testShouldDismissLowBatteryWarning_dismissWhenPowerSaverEnabled() {

    public void testShouldDismissLowBatteryWarning_dismissWhenPowerSaverEnabledLegacy() {

        mPowerUI.start();

        when(mEnhancedEstimates.isHybridNotificationEnabled()).thenReturn(true);

        when(mEnhancedEstimates.isHybridNotificationEnabled()).thenReturn(false);

        when(mEnhancedEstimates.getLowWarningThreshold()).thenReturn(PowerUI.THREE_HOURS_IN_MILLIS);

        when(mEnhancedEstimates.getSevereWarningThreshold()).thenReturn(ONE_HOUR_MILLIS);
@@ -336,6 +336,20 @@ public class PowerUITest extends SysuiTestCase { 
        assertTrue(shouldDismiss);

    }



    @Test

    public void testShouldNotDismissLowBatteryWarning_dismissWhenPowerSaverEnabledHybrid() {

        mPowerUI.start();

        when(mEnhancedEstimates.isHybridNotificationEnabled()).thenReturn(true);

        when(mEnhancedEstimates.getLowWarningThreshold()).thenReturn(PowerUI.THREE_HOURS_IN_MILLIS);

        when(mEnhancedEstimates.getSevereWarningThreshold()).thenReturn(ONE_HOUR_MILLIS);



        // device that gets power saver turned on should dismiss

        boolean shouldDismiss =

            mPowerUI.shouldDismissLowBatteryWarning(UNPLUGGED, BELOW_WARNING_BUCKET,

                BELOW_WARNING_BUCKET, ABOVE_HYBRID_THRESHOLD, !POWER_SAVER_OFF);

        assertFalse(shouldDismiss);

    }



    @Test

    public void testShouldDismissLowBatteryWarning_dismissWhenPlugged() {

        mPowerUI.start();