PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some issues with notif blocking in settings"

Browse Source
This commit is contained in:
Julia Reynolds
2021-01-25 17:18:53 +00:00
committed by Android (Google) Code Review
parent b6ec17e394 c1ca4b81c1
commit 33f4f59b04
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/notification/app/BlockPreferenceController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.notification.app; 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_NONE;
import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
@@ -107,7 +108,7 @@ public class BlockPreferenceController extends NotificationPreferenceController
? IMPORTANCE_NONE ? IMPORTANCE_NONE
: isDefaultChannel() : isDefaultChannel()
? IMPORTANCE_UNSPECIFIED ? IMPORTANCE_UNSPECIFIED
: mChannel.getOriginalImportance(); : Math.max(mChannel.getOriginalImportance(), IMPORTANCE_LOW);
mChannel.setImportance(importance); mChannel.setImportance(importance);
saveChannel(); saveChannel();
} }

4
src/com/android/settings/notification/app/ChannelListPreferenceController.java
View File

@@ -339,7 +339,9 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr
channelPref.setOnPreferenceChangeListener( channelPref.setOnPreferenceChangeListener(
(preference, o) -> { (preference, o) -> {
boolean value = (Boolean) 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.setImportance(importance);
channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE); channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
PrimarySwitchPreference channelPref1 = (PrimarySwitchPreference) preference; PrimarySwitchPreference channelPref1 = (PrimarySwitchPreference) preference;