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

Commit f26a246f authored by Yuri Lin's avatar Yuri Lin
Browse files

Revert "Rename Do Not Disturb -> Priority Mode" 

Revert submission 16632971-yl-prioritymode

Reason for revert: We're not launching this change with T, so this will revert all the relevant string changes.
Reverted Changes:
I5eff72db8:Rename Do Not Disturb -> Priority Mode
Ie7a9e35e6:Rename Do Not Disturb -> Priority Mode
I7bb74d2fd:Rename Do Not Disturb -> Priority Mode
Id17942024:Rename Do Not Disturb -> Priority Mode
Ib8efd7289:Rename Do Not Disturb -> Priority Mode
Ia1b77f9ee:Rename Do Not Disturb -> Priority Mode

Bug: 190180868
Test: TH

Change-Id: I7516c97809c7968f999d7caa8885f0cb5cdc844f
Merged-In: I7516c97809c7968f999d7caa8885f0cb5cdc844f
parent 969625bc

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("None")).isTrue();

        assertThat(mController.getSummary().contains("No apps")).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("None")).isTrue();

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

    }



    @Test