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

Commit 559f65a2 authored by Lei Yu's avatar Lei Yu
Browse files

Show Battery saver tip when battery saver is on 

Before this CL, we only show "Battery Saver is on" when users turn it
on in battery tips.

In this CL, we change to constantly show this tip when battery
saver is on.

Change-Id: I9ddefdbd5818725202ddf4469b4a685ba008060a
Fixes: 75251000
Test: RunSettingsRoboTests
parent cf60ff7e

src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java

+3 −2
Original line number Diff line number Diff line
@@ -55,8 +55,9 @@ public class EarlyWarningDetector implements BatteryTipDetector { 
        final boolean earlyWarning = mPowerUsageFeatureProvider.getEarlyWarningSignal(mContext,

                EarlyWarningDetector.class.getName());



        final int state =

                mPolicy.batterySaverTipEnabled && !powerSaveModeOn && discharging && earlyWarning

        final int state = powerSaveModeOn

                ? BatteryTip.StateType.HANDLED

                : mPolicy.batterySaverTipEnabled && discharging && earlyWarning

                        ? BatteryTip.StateType.NEW

                        : BatteryTip.StateType.INVISIBLE;

        return new EarlyWarningTip(state, powerSaveModeOn);

tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java

+4 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.BatteryManager; 
import android.os.PowerManager;



import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;

import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -74,10 +75,11 @@ public class EarlyWarningDetectorTest { 
    }



    @Test

    public void testDetect_batterySaverOn_tipInvisible() {

    public void testDetect_batterySaverOn_tipHandled() {

        doReturn(true).when(mPowerManager).isPowerSaveMode();



        assertThat(mEarlyWarningDetector.detect().isVisible()).isFalse();

        assertThat(mEarlyWarningDetector.detect().getState())

                .isEqualTo(BatteryTip.StateType.HANDLED);

    }



    @Test