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

Merge "Fix test failures" into main

Browse Source
This commit is contained in:
Julia Reynolds
2024-05-20 18:24:42 +00:00
committed by Android (Google) Code Review
parent b17c5b2489 44044a1898
commit f60595d0d5
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/notification/modes/ZenModesBackend.java
View File

@@ -117,7 +117,6 @@ class ZenModesBackend {
.setManualInvocationAllowed(true) .setManualInvocationAllowed(true)
.setConfigurationActivity(null) // No further settings .setConfigurationActivity(null) // No further settings
.setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_PRIORITY) .setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_PRIORITY)
.setIconResId(com.android.internal.R.drawable.ic_zen_24dp)
.build(); .build();
return ZenMode.manualDndMode(manualDndRule, return ZenMode.manualDndMode(manualDndRule,

8
tests/robotests/src/com/android/settings/notification/modes/ZenModesBackendTest.java
View File

@@ -142,13 +142,11 @@ public class ZenModesBackendTest {
.setType(AutomaticZenRule.TYPE_OTHER) .setType(AutomaticZenRule.TYPE_OTHER)
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY) .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
.setZenPolicy(ZenAdapters.notificationPolicyToZenPolicy(dndPolicy)) .setZenPolicy(ZenAdapters.notificationPolicyToZenPolicy(dndPolicy))
.setTriggerDescription(
mContext.getString(R.string.zen_mode_settings_summary))
.setManualInvocationAllowed(true) .setManualInvocationAllowed(true)
.build(), .build(),
false), false),
new ZenMode("rule1", ZEN_RULE, false), new ZenMode("rule2", rule2, false),
new ZenMode("rule2", rule2, false)) new ZenMode("rule1", ZEN_RULE, false))
.inOrder(); .inOrder();
} }
@@ -167,8 +165,6 @@ public class ZenModesBackendTest {
.setType(AutomaticZenRule.TYPE_OTHER) .setType(AutomaticZenRule.TYPE_OTHER)
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY) .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
.setZenPolicy(ZenAdapters.notificationPolicyToZenPolicy(dndPolicy)) .setZenPolicy(ZenAdapters.notificationPolicyToZenPolicy(dndPolicy))
.setTriggerDescription(
mContext.getString(R.string.zen_mode_settings_summary))
.setManualInvocationAllowed(true) .setManualInvocationAllowed(true)
.build(), false)); .build(), false));
} }