Merge "Show Battery saver tip when battery saver is on" into pi-dev
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java
index cb23e94..a10c8f1 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java
@@ -55,8 +55,9 @@
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);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
index ec9b5d5..21ef8a3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
@@ -27,6 +27,7 @@
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 @@
}
@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