From 44044a1898efcf927bb9689d96a5e7c975bd4cd0 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Mon, 20 May 2024 13:14:26 -0400 Subject: [PATCH] Fix test failures Test: ZenModesBackendTest Flag: android.app.modes_ui Fixes: 341693051 Change-Id: I4149db371a85abe8008c10cf76a84206f75143f6 --- .../settings/notification/modes/ZenModesBackend.java | 1 - .../settings/notification/modes/ZenModesBackendTest.java | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/notification/modes/ZenModesBackend.java b/src/com/android/settings/notification/modes/ZenModesBackend.java index e019ea27940..355adb46198 100644 --- a/src/com/android/settings/notification/modes/ZenModesBackend.java +++ b/src/com/android/settings/notification/modes/ZenModesBackend.java @@ -117,7 +117,6 @@ class ZenModesBackend { .setManualInvocationAllowed(true) .setConfigurationActivity(null) // No further settings .setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_PRIORITY) - .setIconResId(com.android.internal.R.drawable.ic_zen_24dp) .build(); return ZenMode.manualDndMode(manualDndRule, diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModesBackendTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModesBackendTest.java index a0f6f022fa3..75ca7418406 100644 --- a/tests/robotests/src/com/android/settings/notification/modes/ZenModesBackendTest.java +++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModesBackendTest.java @@ -142,13 +142,11 @@ public class ZenModesBackendTest { .setType(AutomaticZenRule.TYPE_OTHER) .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY) .setZenPolicy(ZenAdapters.notificationPolicyToZenPolicy(dndPolicy)) - .setTriggerDescription( - mContext.getString(R.string.zen_mode_settings_summary)) .setManualInvocationAllowed(true) .build(), false), - new ZenMode("rule1", ZEN_RULE, false), - new ZenMode("rule2", rule2, false)) + new ZenMode("rule2", rule2, false), + new ZenMode("rule1", ZEN_RULE, false)) .inOrder(); } @@ -167,8 +165,6 @@ public class ZenModesBackendTest { .setType(AutomaticZenRule.TYPE_OTHER) .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY) .setZenPolicy(ZenAdapters.notificationPolicyToZenPolicy(dndPolicy)) - .setTriggerDescription( - mContext.getString(R.string.zen_mode_settings_summary)) .setManualInvocationAllowed(true) .build(), false)); }