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

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

Merge "Merge ZenMode.canEditName() and canEditIcon()" into main

parents 92ca5d19 3e1b3c5c

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

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

                mRule, oldCondition, conditionId));

    }

    }





    public boolean canEditName() {

    public boolean canEditNameAndIcon() {

        return !isManualDnd();

    }



    public boolean canEditIcon() {

        return !isManualDnd();

        return !isManualDnd();

    }

    }

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

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

        assertThat(zenMode.getId()).isEqualTo("id");

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

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

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

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

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

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

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

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

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





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

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

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

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

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

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

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

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

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

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

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

    }

    }