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

Commit 4193730a authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Battery saver notifications should be public."

parents ebf55ad6 a0388bb6

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -152,6 +152,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
                .setContentText(mContext.getString(R.string.invalid_charger_text))

                .setContentText(mContext.getString(R.string.invalid_charger_text))

                .setPriority(Notification.PRIORITY_MAX)

                .setPriority(Notification.PRIORITY_MAX)

                .setCategory(Notification.CATEGORY_SYSTEM)

                .setCategory(Notification.CATEGORY_SYSTEM)

                .setVisibility(Notification.VISIBILITY_PUBLIC)

                .setFullScreenIntent(pendingBroadcast(ACTION_SHOW_FALLBACK_CHARGER), true);

                .setFullScreenIntent(pendingBroadcast(ACTION_SHOW_FALLBACK_CHARGER), true);

        final Notification n = nb.build();

        final Notification n = nb.build();

        if (n.headsUpContentView != null) {

        if (n.headsUpContentView != null) {
@@ -171,6 +172,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
                .setOngoing(true)

                .setOngoing(true)

                .setPriority(Notification.PRIORITY_MAX)

                .setPriority(Notification.PRIORITY_MAX)

                .setCategory(Notification.CATEGORY_SYSTEM)

                .setCategory(Notification.CATEGORY_SYSTEM)

                .setVisibility(Notification.VISIBILITY_PUBLIC)

                .setFullScreenIntent(pendingBroadcast(ACTION_SHOW_FALLBACK_WARNING), true);

                .setFullScreenIntent(pendingBroadcast(ACTION_SHOW_FALLBACK_WARNING), true);

        if (hasBatterySettings()) {

        if (hasBatterySettings()) {

            nb.setContentIntent(pendingBroadcast(ACTION_SHOW_BATTERY_SETTINGS));

            nb.setContentIntent(pendingBroadcast(ACTION_SHOW_BATTERY_SETTINGS));
@@ -197,7 +199,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { 
                .setContentText(mContext.getString(R.string.battery_saver_notification_text))

                .setContentText(mContext.getString(R.string.battery_saver_notification_text))

                .setOngoing(true)

                .setOngoing(true)

                .setShowWhen(false)

                .setShowWhen(false)

                .setCategory(Notification.CATEGORY_SYSTEM);

                .setCategory(Notification.CATEGORY_SYSTEM)

                .setVisibility(Notification.VISIBILITY_PUBLIC);

        if (hasSaverSettings()) {

        if (hasSaverSettings()) {

            nb.addAction(0,

            nb.addAction(0,

                    mContext.getString(R.string.battery_saver_notification_action_text),

                    mContext.getString(R.string.battery_saver_notification_action_text),