Merge "Filter out disabled modes from the "can activate automatically" count" into main

2024-08-07 18:51:27 +00:00
parent 1a8c84dfb3 d70fbf8e91
commit 494dc4c282
2 changed files with 7 additions and 3 deletions
--- a/src/com/android/settings/notification/modes/ZenModeSummaryHelper.java
+++ b/src/com/android/settings/notification/modes/ZenModeSummaryHelper.java
@@ -514,7 +514,7 @@ class ZenModeSummaryHelper {
            return msgFormat.format(args);
        } else {
            int automaticModeCount = (int) modes.stream()
-                    .filter(m -> !m.isManualDnd() && !m.isCustomManual())
+                    .filter(m -> m.isEnabled() && !m.isManualDnd() && !m.isCustomManual())
                    .count();

            MessageFormat msgFormat = new MessageFormat(