Merge "Replace direct usage of update origin by TestModeBuilder.setEnabled() overload" into main

This commit is contained in:
Treehugger Robot
2024-08-03 18:22:25 +00:00
committed by Android (Google) Code Review

View File

@@ -22,7 +22,6 @@ import android.app.Flags;
import android.content.Context; import android.content.Context;
import android.platform.test.annotations.EnableFlags; import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule; import android.platform.test.flag.junit.SetFlagsRule;
import android.service.notification.ZenModeConfig;
import com.android.settingslib.notification.modes.TestModeBuilder; import com.android.settingslib.notification.modes.TestModeBuilder;
import com.android.settingslib.notification.modes.ZenMode; import com.android.settingslib.notification.modes.ZenMode;
@@ -94,14 +93,10 @@ public class ZenModesListItemPreferenceTest {
@Test @Test
public void setZenMode_modeDisabledByApp() { public void setZenMode_modeDisabledByApp() {
ZenModeConfig.ZenRule configRule = new ZenModeConfig.ZenRule();
configRule.enabled = false;
configRule.disabledOrigin = ZenModeConfig.UPDATE_ORIGIN_APP;
ZenMode mode = new TestModeBuilder() ZenMode mode = new TestModeBuilder()
.setName("Mode disabled by app") .setName("Mode disabled by app")
.setTriggerDescription("When the cat's away") .setTriggerDescription("When the cat's away")
.setEnabled(false) .setEnabled(false, /* byUser= */ false)
.setConfigZenRule(configRule)
.build(); .build();
ZenModesListItemPreference preference = new ZenModesListItemPreference(mContext, mode); ZenModesListItemPreference preference = new ZenModesListItemPreference(mContext, mode);
@@ -114,14 +109,10 @@ public class ZenModesListItemPreferenceTest {
@Test @Test
public void setZenMode_modeDisabledByUser() { public void setZenMode_modeDisabledByUser() {
ZenModeConfig.ZenRule configRule = new ZenModeConfig.ZenRule();
configRule.enabled = false;
configRule.disabledOrigin = ZenModeConfig.UPDATE_ORIGIN_USER;
ZenMode mode = new TestModeBuilder() ZenMode mode = new TestModeBuilder()
.setName("Mode disabled by user") .setName("Mode disabled by user")
.setTriggerDescription("When the Levee Breaks") .setTriggerDescription("When the Levee Breaks")
.setEnabled(false) .setEnabled(false, /* byUser= */ true)
.setConfigZenRule(configRule)
.build(); .build();
ZenModesListItemPreference preference = new ZenModesListItemPreference(mContext, mode); ZenModesListItemPreference preference = new ZenModesListItemPreference(mContext, mode);