diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4d793486bbe..3363f929c25 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8308,7 +8308,7 @@
upgrade, android
- dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event, do not disturb
+ dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event
screen, lock time, timeout, lockscreen
@@ -8390,7 +8390,7 @@
Ring & notification volume at %1$s
- Volume, vibration, Priority mode
+ Volume, vibration, Do Not Disturb
Ringer set to vibrate
@@ -8500,8 +8500,8 @@
Automatically caption media
-
-
+
+
{count, plural,
=0 {None}
=1 {1 schedule set}
@@ -8509,8 +8509,8 @@
}
-
- Priority mode
+
+ Do Not Disturb
Only get notified by important people and apps
@@ -8518,11 +8518,11 @@
Limit interruptions
-
- Turn on Priority mode
+
+ Turn on Do Not Disturb
-
- Alarms and media sounds
+
+ Alarms and media sounds can interrupt
Schedules
@@ -8548,11 +8548,11 @@
Silence phone at certain times
-
- Set Priority mode rules
+
+ Set Do Not Disturb rules
-
- Turn on Priority mode automatically
+
+ Schedule
Use schedule
@@ -8560,8 +8560,8 @@
%1$s: %2$s
-
- Allow sounds when Priority mode is on
+
+ Allow interruptions that make sound
Block visual disturbances
@@ -8569,10 +8569,10 @@
Allow visual signals
-
- Display options for low-priority notifications
-
- When Priority mode is on
+
+ Display options for hidden notifications
+
+ When Do Not Disturb is on
No sound from notifications
@@ -8583,20 +8583,20 @@
No visuals or sound from notifications
You won\u2019t see or hear notifications
-
- Your phone won\u2019t show, vibrate or make sound for new or existing notifications. Keep in mind, critical notifications for phone activity and status will still appear.\n\nWhen you turn off Priority mode, find missed notifications by swiping down from the top of your screen.
+
+ Your phone won\u2019t show, vibrate or make sound for new or existing notifications. Keep in mind, critical notifications for phone activity and status will still appear.\n\nWhen you turn off Do Not Disturb, find missed notifications by swiping down from the top of your screen.
Custom
Enable custom setting
Remove custom setting
-
- No sound from notifications
-
- Partially hidden
-
- No visuals or sound from notifications
+
+ No sound from notifications
+
+ Partially hidden
+
+ No visuals or sound from notifications
Custom restrictions
@@ -8647,26 +8647,26 @@
Turn on
-
- Turn on
+
+ Turn on now
-
- Turn off
+
+ Turn off now
-
- Priority mode is on until %s
+
+ Do Not Disturb is on until %s
-
- Priority mode will stay on until you turn it off
+
+ Do Not Disturb will stay on until you turn it off
-
- Priority mode was automatically turned on by a schedule (%s)
+
+ Do Not Disturb was automatically turned on by a schedule (%s)
-
- Priority mode was automatically turned on by an app (%s)
+
+ Do Not Disturb was automatically turned on by an app (%s)
-
- Priority mode is on for %s with custom settings.
+
+ Do Not Disturb is on for %s with custom settings.
View custom settings
@@ -8677,11 +8677,11 @@
%1$s. %2$s
-
- On / %1$s
+
+ On / %1$s
-
- On
+
+ On
Ask every time
@@ -8714,25 +8714,25 @@
}
-
- Notifications that can reach you
-
- People
-
- Apps
-
- Alarms & other notifications
-
- Schedules
-
- Duration for Quick Settings
-
+ What can interrupt Do Not Disturb
+
+ People
+
+ Apps
+
+ Alarms & other interruptions
+
+ Schedules
+
+ Duration for Quick Settings
+
- Advanced
+ General
-
- When Priority mode is on, sound and vibration will be muted, except for the items you allow above.
+
+ When Do Not Disturb is on, sound and vibration will be muted, except for the items you allow above.
Custom settings
@@ -8747,8 +8747,8 @@
Messages, events & reminders
-
- When Priority mode is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.
+
+ When Do Not Disturb is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.
Done
@@ -8764,8 +8764,8 @@
(Current setting)
-
- Change Priority mode notification settings?
+
+ Change Do Not Disturb notification settings?
Your phone can do more to help you focus.\n\nUpdate settings to:\n\n- Hide notifications completely\n\n- Allow calls from starred contacts and repeat callers
@@ -9191,7 +9191,7 @@
Bubble priority conversations
- Priority conversations show at the top of the pull-down shade. You can also set them to bubble when Priority mode is on.
+ Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb.
Priority and modified conversations will appear here
@@ -9335,12 +9335,12 @@
%1$s?
-
+
Enhanced notifications replaced Android Adaptive Notifications in Android 12.
This feature shows suggested actions and replies, and organizes your notifications.
\n\nEnhanced notifications can access notification content, including personal information
like contact names and messages. This feature can also dismiss or respond to notifications,
- such as answering phone calls, and control Priority mode.
+ such as answering phone calls, and control Do Not Disturb.
-
+
%1$s will be able to read all notifications,
including personal information such as contact names, photos, and the text of messages you receive.
This app will also be able to snooze or dismiss notifications or take action on buttons in notifications, including answering phone calls.
- \n\nThis will also give the app the ability to turn Priority mode on or off and change related settings.
+ \n\nThis will also give the app the ability to turn Do Not Disturb on or off and change related settings.
%1$s will be able to:
Read your notifications
@@ -9361,9 +9361,9 @@
Reply to messages
It can reply to messages and take action on buttons in notifications, including snoozing or dismissing notifications and answering calls.
Change settings
- It can turn Priority mode on or off and change related settings.
-
- If you turn off notification access for %1$s, Priority mode access may also be turned off.
+ It can turn Do Not Disturb on or off and change related settings.
+
+ If you turn off notification access for %1$s, Do Not Disturb access may also be turned off.
Turn off
Cancel
@@ -9526,14 +9526,14 @@
The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=NONE]-->
Tap to get the app
-
- Priority mode access
+
+ Do Not Disturb access
-
- Allow Priority mode
+
+ Allow Do Not Disturb
-
- No installed apps have requested Priority mode access
+
+ No installed apps have requested Do Not Disturb access
Loading apps\u2026
@@ -9606,11 +9606,11 @@
Show notification dot
-
- Override Priority mode
+
+ Override Do Not Disturb
-
- Let these notifications continue to notify you when Priority mode is on
+
+ Let these notifications continue to interrupt when Do Not Disturb is on
Lock screen
@@ -9661,7 +9661,7 @@
Schedule name already in use
- Add a schedule
+ Add more
Add event schedule
@@ -9684,26 +9684,26 @@
Unknown
-
- These settings can\'t be changed right now. An app (%1$s) has automatically turned on Priority mode with custom behavior."
+
+ These settings can\'t be changed right now. An app (%1$s) has automatically turned on Do Not Disturb with custom behavior."
-
- These settings can\'t be changed right now. An app has automatically turned on Priority mode with custom behavior."
+
+ These settings can\'t be changed right now. An app has automatically turned on Do Not Disturb with custom behavior."
-
- These settings can\'t be changed right now. Priority mode was manually turned on with custom behavior."
+
+ These settings can\'t be changed right now. Do Not Disturb was manually turned on with custom behavior."
Time
- Automatic rule set to turn on Priority mode during specified times
+ Automatic rule set to turn on Do Not Disturb during specified times
Event
- Automatic rule set to turn on Priority mode during specified events
+ Automatic rule set to turn on Do Not Disturb during specified events
During events for
@@ -9751,13 +9751,13 @@
Every day
- Use alarm as the end time
+ Alarm can override end time
- Schedule turns off when next alarm rings
+ Schedule turns off when an alarm rings
- Customized Priority mode behavior
+ Do Not Disturb behavior
Use default settings
@@ -9796,7 +9796,7 @@
- Who can reach you
+ Who can interrupt
Even if messaging or calling apps can\u0027t notify you, people you choose here can still reach you through those apps
@@ -9808,7 +9808,7 @@
calls
- Who can call you
+ Calls that can interrupt
To make sure allowed calls make sound, check that device is set to ring
@@ -9837,7 +9837,7 @@
Messages
- Who can message you
+ Messages that can interrupt
To make sure allowed messages make sound, check that device is set to ring
@@ -9864,12 +9864,12 @@
Some people or conversations
-
- From starred contacts and repeat callers
-
- From contacts and repeat callers
-
- From repeat callers only
+
+ From starred contacts and repeat callers
+
+ From contacts and repeat callers
+
+ From repeat callers only
None
@@ -9923,14 +9923,14 @@
Allow apps to override
-
- Apps that can notify you
-
- Choose more apps
-
- None
-
- No apps can notify you
+
+ Apps that can interrupt
+
+ Select more apps
+
+ No apps selected
+
+ No apps can interrupt
Add apps
Some notifications
-
- If calling or messaging apps can\u0027t notify you, people you choose in Priority mode settings can still reach you through those apps
-
-
+
+ Selected people can still reach you, even if you don\u2019t allow apps to interrupt
+
+
{count, plural, offset:2
- =0 {None}
- =1 {{app_1}}
- =2 {{app_1} and {app_2}}
- =3 {{app_1}, {app_2}, and {app_3}}
- other {{app_1}, {app_2}, and # more}
+ =0 {No apps can interrupt}
+ =1 {{app_1} can interrupt}
+ =2 {{app_1} and {app_2} can interrupt}
+ =3 {{app_1}, {app_2}, and {app_3} can interrupt}
+ other {{app_1}, {app_2}, and # more can interrupt}
}
@@ -9957,30 +9957,30 @@
All notifications
Some notifications
-
- Notifications that can reach you
+
+ Notifications that can interrupt
Allow all notifications
-
+
{count, plural, offset:2
- =0 {None}
- =1 {{sound_category_1}}
- =2 {{sound_category_1} and {sound_category_2}}
- =3 {{sound_category_1}, {sound_category_2}, and {sound_category_3}}
- other {{sound_category_1}, {sound_category_2}, and # more}
+ =0 {Nothing can interrupt}
+ =1 {{sound_category_1} can interrupt}
+ =2 {{sound_category_1} and {sound_category_2} can interrupt}
+ =3 {{sound_category_1}, {sound_category_2}, and {sound_category_3} can interrupt}
+ other {{sound_category_1}, {sound_category_2}, and # more can interrupt}
}
-
- None
+
+ Nothing can interrupt
- None
+ No one can interrupt
- Some people can reach you
+ Some people can interrupt
- Anyone can reach you
+ All people can interrupt
Repeat callers
@@ -10039,13 +10039,13 @@
When the screen is on
- Let notifications silenced by Priority mode pop on screen and show a status bar icon
+ Let notifications silenced by Do Not Disturb pop on screen and show a status bar icon
When the screen is off
- Let notifications silenced by Priority mode turn on the screen and blink the light
+ Let notifications silenced by Do Not Disturb turn on the screen and blink the light
- Let notifications silenced by Priority mode turn on the screen
+ Let notifications silenced by Do Not Disturb turn on the screen
@@ -10298,8 +10298,8 @@
Sensitive content not on lock screen
Not on lock screen
-
- Priority mode overridden
+
+ Do Not Disturb overridden
\u00A0/\u00A0
@@ -10376,7 +10376,7 @@
Categories: Turned off
- Categories: Overrides Priority mode
+ Categories: Overrides Do Not Disturb
Advanced
@@ -10820,18 +10820,18 @@
No data used
- Allow access to Priority mode for %1$s?
+ Allow access to Do Not Disturb for %1$s?
- The app will be able to turn on/off Priority mode and make changes to related settings.
+ The app will be able to turn on/off Do Not Disturb and make changes to related settings.
Must stay turned on because notification access is on
- Revoke access to Priority mode for %1$s?
+ Revoke access to Do Not Disturb for %1$s?
- All Priority mode rules created by this app will be removed.
+ All Do Not Disturb rules created by this app will be removed.
Don\u2019t optimize
@@ -11104,8 +11104,8 @@
Networks unavailable
-
- Priority mode is on
+
+ Do Not Disturb is on
Phone muted
@@ -12339,8 +12339,8 @@
-
- Update Priority mode
+
+ Update Do Not Disturb
Pause notifications to stay focused
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
index 8f31b0a3599..460ae2dee32 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
@@ -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