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

Commit 3e1b3c5c authored by Matías Hernández's avatar Matías Hernández
Browse files

Merge ZenMode.canEditName() and canEditIcon() 

Bug: 346278854
Test: atest ZenModeTest
Flag: android.app.modes_ui
Change-Id: I19949d08ba210d8869926e08b644af7d6b19c1df
parent ecfe1370

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

+1 −5
Original line number Diff line number Diff line
@@ -286,11 +286,7 @@ public class ZenMode implements Parcelable { 
                mRule, oldCondition, conditionId));

    }



    public boolean canEditName() {

        return !isManualDnd();

    }



    public boolean canEditIcon() {

    public boolean canEditNameAndIcon() {

        return !isManualDnd();

    }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/modes/ZenModeTest.java

+2 −0
Original line number Diff line number Diff line
@@ -56,12 +56,14 @@ public class ZenModeTest { 
        assertThat(zenMode.getId()).isEqualTo("id");

        assertThat(zenMode.getRule()).isEqualTo(ZEN_RULE);

        assertThat(zenMode.isManualDnd()).isFalse();

        assertThat(zenMode.canEditNameAndIcon()).isTrue();

        assertThat(zenMode.canBeDeleted()).isTrue();

        assertThat(zenMode.isActive()).isTrue();



        ZenMode manualMode = ZenMode.manualDndMode(ZEN_RULE, false);

        assertThat(manualMode.getId()).isEqualTo(ZenMode.MANUAL_DND_MODE_ID);

        assertThat(manualMode.isManualDnd()).isTrue();

        assertThat(manualMode.canEditNameAndIcon()).isFalse();

        assertThat(manualMode.canBeDeleted()).isFalse();

        assertThat(manualMode.isActive()).isFalse();

    }