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

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

Merge "Allow some system channels to be blocked" into oc-dev

parents 136a3da4 3a77e1d4

src/com/android/settings/notification/AppNotificationSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ public class AppNotificationSettings extends NotificationSettingsBase { 
            final NotificationChannel channel) {

        MasterSwitchPreference channelPref = new MasterSwitchPreference(

                getPrefContext());

        channelPref.setSwitchEnabled(mSuspendedAppsAdmin == null && !mAppRow.systemApp);

        channelPref.setSwitchEnabled(mSuspendedAppsAdmin == null

                &&  isChannelBlockable(mAppRow.systemApp, channel));

        channelPref.setKey(channel.getId());

        channelPref.setTitle(channel.getName());

        channelPref.setChecked(channel.getImportance() != IMPORTANCE_NONE);

src/com/android/settings/notification/ChannelNotificationSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ public class ChannelNotificationSettings extends NotificationSettingsBase { 
        mBlockBar.setKey(KEY_BLOCK);

        getPreferenceScreen().addPreference(mBlockBar);



        if (mAppRow.systemApp && mChannel.getImportance() != NotificationManager.IMPORTANCE_NONE) {

        if (!isChannelBlockable(mAppRow.systemApp, mChannel)) {

            setVisible(mBlockBar, false);

        }

src/com/android/settings/notification/NotificationSettingsBase.java

+8 −0
Original line number Diff line number Diff line
@@ -443,4 +443,12 @@ abstract public class NotificationSettingsBase extends SettingsPreferenceFragmen 


        return lockscreenSecure;

    }



    protected boolean isChannelBlockable(boolean systemApp, NotificationChannel channel) {

        if (!mAppRow.systemApp) {

            return true;

        }

        return channel.isBlockableSystem()

                || channel.getImportance() == NotificationManager.IMPORTANCE_NONE;

    }

}