Merge "Show Battery saver tip when battery saver is on" into pi-dev

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