PowerUI: dismiss warning notifications when falling back.

The full-screen intents simply fire broadcasts to open fallback
dialogs.  This means the warning notifications are left visible
under the dialog on the lockscreen, or after the dialog is
quickly dismissed.

Once we launch the fallback dialogs, there is no reason for the
notification form to exist.

Bug:13329308
Change-Id: I5735c65d7e8eb620493d3ef3a2cfc27f75cecbb5

1 files changed, 9 insertions, 2 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
index 3fa8b99..da8a5cb 100644
--- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
+++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java
@@ -34,7 +34,6 @@ import android.os.Handler;
 import android.os.SystemClock;
 import android.os.UserHandle;
 import android.provider.Settings;
-import android.util.Log;
 import android.util.Slog;
 import android.view.ContextThemeWrapper;
 import android.view.View;
@@ -312,6 +311,12 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
 
     @Override
     public void dismissInvalidChargerWarning() {
+        dismissInvalidChargerNotification();
+        mFallbackDialogs.dismissInvalidChargerWarning();
+    }
+
+    private void dismissInvalidChargerNotification() {
+        Slog.i(TAG, "dismissing invalid charger notification");
         mInvalidCharger = false;
         updateNotification();
     }
@@ -355,10 +360,12 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
         @Override
         public void onReceive(Context context, Intent intent) {
             final String action = intent.getAction();
-            Log.d(TAG, "got " + action);
+            Slog.i(TAG, "Received " + action);
             if (action.equals(ACTION_SHOW_FALLBACK_WARNING)) {
+                dismissLowBatteryNotification();
                 mFallbackDialogs.showLowBatteryWarning(false /*playSound*/);
             } else if (action.equals(ACTION_SHOW_FALLBACK_CHARGER)) {
+                dismissInvalidChargerNotification();
                 mFallbackDialogs.showInvalidChargerWarning();
             } else if (action.equals(ACTION_SHOW_BATTERY_SETTINGS)) {
                 dismissLowBatteryNotification();