Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 133e7309 authored by Matías Hernández's avatar Matías Hernández Committed by Android (Google) Code Review
Browse files

Merge "Rename MANUAL_DND to MANUAL_DND_ACTIVE in TestModeBuilder" into main

parents 21bdcf11 c639af8e

packages/SettingsLib/src/com/android/settingslib/notification/modes/TestModeBuilder.java

+9 −4
Original line number Diff line number Diff line
@@ -40,13 +40,18 @@ public class TestModeBuilder { 
    private ZenModeConfig.ZenRule mConfigZenRule;



    public static final ZenMode EXAMPLE = new TestModeBuilder().build();

    public static final ZenMode MANUAL_DND = ZenMode.manualDndMode(

            new AutomaticZenRule.Builder("Manual DND", Uri.parse("rule://dnd"))

    public static final ZenMode MANUAL_DND_ACTIVE = ZenMode.manualDndMode(

            new AutomaticZenRule.Builder("Do Not Disturb", Uri.parse("rule://dnd"))

                    .setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_PRIORITY)

                    .setZenPolicy(new ZenPolicy.Builder().disallowAllSounds().build())

                    .build(),

            true /* isActive */

    );

            /* isActive= */ true);

    public static final ZenMode MANUAL_DND_INACTIVE = ZenMode.manualDndMode(

            new AutomaticZenRule.Builder("Do Not Disturb", Uri.parse("rule://dnd"))

                    .setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_PRIORITY)

                    .setZenPolicy(new ZenPolicy.Builder().disallowAllSounds().build())

                    .build(),

            /* isActive= */ false);



    public TestModeBuilder() {

        // Reasonable defaults

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/domain/interactor/ZenModeInteractorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ class ZenModeInteractorTest : SysuiTestCase() { 
    @Test

    fun shouldAskForZenDuration_changesWithSetting() =

        testScope.runTest {

            val manualDnd = TestModeBuilder.MANUAL_DND

            val manualDnd = TestModeBuilder.MANUAL_DND_ACTIVE



            settingsRepository.setInt(ZEN_DURATION, ZEN_DURATION_FOREVER)

            runCurrent()
@@ -201,7 +201,7 @@ class ZenModeInteractorTest : SysuiTestCase() { 
    @Test

    fun activateMode_usesCorrectDuration() =

        testScope.runTest {

            val manualDnd = TestModeBuilder.MANUAL_DND

            val manualDnd = TestModeBuilder.MANUAL_DND_ACTIVE

            zenModeRepository.addModes(listOf(manualDnd))

            settingsRepository.setInt(ZEN_DURATION, ZEN_DURATION_FOREVER)

            runCurrent()

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/ui/dialog/viewmodel/ModesDialogViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { 
                        .setName("Disabled by other")

                        .setEnabled(false, /* byUser= */ false)

                        .build(),

                    TestModeBuilder.MANUAL_DND,

                    TestModeBuilder.MANUAL_DND_ACTIVE,

                    TestModeBuilder()

                        .setName("Enabled")

                        .setEnabled(true)
@@ -91,7 +91,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { 
                assertThat(this.enabled).isEqualTo(false)

            }

            with(tiles?.elementAt(1)!!) {

                assertThat(this.text).isEqualTo("Manual DND")

                assertThat(this.text).isEqualTo("Do Not Disturb")

                assertThat(this.subtext).isEqualTo("On")

                assertThat(this.enabled).isEqualTo(true)

            }