Don't show ringer status if dnd overrides it

If DND is overriding the ringer then:
- Don't show silent/vibrate ringer in status bar
- Don't show silent/vibrate ringer status in QS

Change-Id: I0c921905c6b06e1379b497dd1ac9e3fce483d5fd
Fixes:77651394
Test: manual
This commit is contained in:
Beverly
2018-04-12 15:02:45 -04:00
parent fb10508cfa
commit b9826dd191
3 changed files with 84 additions and 25 deletions

View File

@@ -1469,6 +1469,17 @@ public class ZenModeConfig implements Parcelable {
&& !allowRepeatCallers;
}
/**
* Determines if DND is currently overriding the ringer
*/
public static boolean isZenOverridingRinger(int zen, ZenModeConfig zenConfig) {
// TODO (beverlyt): check if apps can bypass dnd b/77729075
return zen == Global.ZEN_MODE_NO_INTERRUPTIONS
|| zen == Global.ZEN_MODE_ALARMS
|| (zen == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS
&& ZenModeConfig.areAllPriorityOnlyNotificationZenSoundsMuted(zenConfig));
}
/**
* Determines whether dnd behavior should mute all sounds controlled by ringer
*/