From 559f65a28aa19429fbbbe969ec0eb6b96a5db8b6 Mon Sep 17 00:00:00 2001 From: Lei Yu Date: Wed, 4 Apr 2018 13:30:42 -0700 Subject: [PATCH] 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 --- .../batterytip/detectors/EarlyWarningDetector.java | 5 +++-- .../batterytip/detectors/EarlyWarningDetectorTest.java | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java index cb23e946d58..a10c8f1daf1 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 @@ 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); 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 ec9b5d5d0cd..21ef8a358d1 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.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