Merge "Show Battery saver tip when battery saver is on" into pi-dev am: 197be04330 (9f2a9e43) · Commits · e / os / android_packages_apps_Settings

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);

+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