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

Commit 33f4f59b authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Fix some issues with notif blocking in settings"

parents b6ec17e3 c1ca4b81

src/com/android/settings/notification/app/BlockPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.notification.app;



import static android.app.NotificationManager.IMPORTANCE_LOW;

import static android.app.NotificationManager.IMPORTANCE_NONE;

import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
@@ -107,7 +108,7 @@ public class BlockPreferenceController extends NotificationPreferenceController 
                        ? IMPORTANCE_NONE

                        : isDefaultChannel()

                                ? IMPORTANCE_UNSPECIFIED

                                : mChannel.getOriginalImportance();

                                : Math.max(mChannel.getOriginalImportance(), IMPORTANCE_LOW);

                mChannel.setImportance(importance);

                saveChannel();

            }

src/com/android/settings/notification/app/ChannelListPreferenceController.java

+3 −1
Original line number Diff line number Diff line
@@ -339,7 +339,9 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr 
        channelPref.setOnPreferenceChangeListener(

                (preference, o) -> {

                    boolean value = (Boolean) o;

                    int importance = value ? channel.getOriginalImportance() : IMPORTANCE_NONE;

                    int importance = value

                            ? Math.max(channel.getOriginalImportance(), IMPORTANCE_LOW)

                            : IMPORTANCE_NONE;

                    channel.setImportance(importance);

                    channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);

                    PrimarySwitchPreference channelPref1 = (PrimarySwitchPreference) preference;