Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cf5fc2e authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am c4288bbd: Merge "PowerUI: dismiss warning notifications when falling back." into lmp-preview-dev 

* commit 'c4288bbd56d6b89ffd9534bd78b17b491d131b3f':
  PowerUI: dismiss warning notifications when falling back.
parents 6cf5f802 0c377a90

packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java

+9 −2
Original line number Diff line number Diff line
@@ -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;
@@ -303,6 +302,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();

    }
@@ -346,10 +351,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();