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

Commit 8b8b0640 authored by Yuri Lin's avatar Yuri Lin Committed by Android (Google) Code Review
Browse files

Merge "Rename Do Not Disturb -> Priority Mode"

parents 47d115c3 e6e5847c

res/values/strings.xml

+150 −150

File changed.

Preview size limit exceeded, changes collapsed.

tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public class ZenModeBypassingAppsPreferenceControllerTest { 
        // only channel bypassing DND is a conversation (which will be showed on the

        // conversations page instead of the apps page)

        assertThat(mController.mPreference.isEnabled()).isTrue();

        assertThat(mController.getSummary().contains("No apps")).isTrue();

        assertThat(mController.getSummary().contains("None")).isTrue();

    }



    @Test
@@ -246,7 +246,7 @@ public class ZenModeBypassingAppsPreferenceControllerTest { 


        // THEN the preference is enabled and summary is updated

        assertThat(mController.mPreference.isEnabled()).isTrue();

        assertThat(mController.getSummary().contains("No apps")).isTrue();

        assertThat(mController.getSummary().contains("None")).isTrue();

    }



    @Test