Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow some system channels to be blocked" into oc-dev am: 540e8f50e3

Browse Source 
am: 166a994a4c

Change-Id: Ide3aeac0c328f08becc693795ef5553fa0c9a281
This commit is contained in:
Julia Reynolds
2017-05-26 15:02:40 +00:00
committed by android-build-merger
parent f0d95eaa56 166a994a4c
commit f1239e1b84
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -201,7 +201,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);