Merge "Show Battery saver tip when battery saver is on" into pi-dev am: 197be04330

am: 16a0fcc6c3

Change-Id: I10516fa83c18d015fc3f9aa642313a7cb7259425
This commit is contained in:
Lei Yu
2018-04-05 11:49:04 -07:00
committed by android-build-merger
2 changed files with 7 additions and 4 deletions

View File

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