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

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

Browse Source
This commit is contained in:
Matías Hernández
2024-08-07 18:51:27 +00:00
committed by Android (Google) Code Review
parent 1a8c84dfb3 d70fbf8e91
commit 494dc4c282
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/modes/ZenModeSummaryHelper.java
View File

@@ -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(

8
tests/robotests/src/com/android/settings/notification/modes/ZenModesSummaryHelperTest.java → tests/robotests/src/com/android/settings/notification/modes/ZenModeSummaryHelperTest.java
View File

@@ -61,7 +61,7 @@ import java.util.Random;
@RunWith(RobolectricTestRunner.class)
@EnableFlags(Flags.FLAG_MODES_UI)
public class ZenModesSummaryHelperTest {
public class ZenModeSummaryHelperTest {
private static final int WORK_PROFILE_ID = 3;
private Context mContext;
@@ -489,7 +489,7 @@ public class ZenModesSummaryHelperTest {
}
@Test
public void getModesSummary_noRulesActive_countsOnlyAutomaticModes() {
public void getModesSummary_noRulesActive_countsOnlyEnabledAutomaticModes() {
ImmutableList<ZenMode> modes = ImmutableList.of(
TestModeBuilder.MANUAL_DND_INACTIVE, // Not automatic
new TestModeBuilder().setName("Auto 1").build(), // App provided automatic
@@ -499,6 +499,10 @@ public class ZenModesSummaryHelperTest {
.setType(AutomaticZenRule.TYPE_OTHER)
.setConditionId(ZenModeConfig.toCustomManualConditionId())
.build(), // Custom manual, not automatic
new TestModeBuilder()
.setName("Disabled 1")
.setEnabled(false)
.build(), // Would be automatic, but it's disabled.
new TestModeBuilder()
.setName("Sleep")
.setPackage(SystemZenRules.PACKAGE_ANDROID)