From e6e5847cce9e5a91d58bd417fc122546396dd6cd Mon Sep 17 00:00:00 2001 From: Yuri Lin Date: Wed, 12 Jan 2022 16:47:03 -0500 Subject: [PATCH] Rename Do Not Disturb -> Priority Mode in strings only -- no UI changes in this CL. Bug: 190180868 Test: manual, ZenModeBypassingAppsPreferenceControllerTest (robotest) Change-Id: I7bb74d2fd1a9d3b24a8b81a6cc8ba35d38b25656 --- res/values/strings.xml | 300 +++++++++--------- ...BypassingAppsPreferenceControllerTest.java | 4 +- 2 files changed, 152 insertions(+), 152 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index ec72321ced8..6206bbc1fb3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8223,7 +8223,7 @@ upgrade, android - dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event + dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event, do not disturb screen, lock time, timeout, lockscreen @@ -8305,7 +8305,7 @@ Ring & notification volume at %1$s - Volume, vibration, Do Not Disturb + Volume, vibration, Priority mode Ringer set to vibrate @@ -8412,8 +8412,8 @@ Automatically caption media - - + + {count, plural, =0 {None} =1 {1 schedule set} @@ -8421,8 +8421,8 @@ } - - Do Not Disturb + + Priority mode Only get notified by important people and apps @@ -8430,11 +8430,11 @@ Limit interruptions - - Turn on Do Not Disturb + + Turn on Priority mode - - Alarms and media sounds can interrupt + + Alarms and media sounds Schedules @@ -8460,11 +8460,11 @@ Silence phone at certain times - - Set Do Not Disturb rules + + Set Priority mode rules - - Schedule + + Turn on Priority mode automatically Use schedule @@ -8472,8 +8472,8 @@ %1$s: %2$s - - Allow interruptions that make sound + + Allow sounds when Priority mode is on Block visual disturbances @@ -8481,10 +8481,10 @@ Allow visual signals - - Display options for hidden notifications - - When Do Not Disturb is on + + Display options for low-priority notifications + + When Priority mode is on No sound from notifications @@ -8495,20 +8495,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 Do Not Disturb, 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 Priority mode, 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 @@ -8559,26 +8559,26 @@ Turn on - - Turn on now + + Turn on - - Turn off now + + Turn off - - Do Not Disturb is on until %s + + Priority mode is on until %s - - Do Not Disturb will stay on until you turn it off + + Priority mode will stay on until you turn it off - - Do Not Disturb was automatically turned on by a schedule (%s) + + Priority mode was automatically turned on by a schedule (%s) - - Do Not Disturb was automatically turned on by an app (%s) + + Priority mode was automatically turned on by an app (%s) - - Do Not Disturb is on for %s with custom settings. + + Priority mode is on for %s with custom settings. View custom settings @@ -8589,11 +8589,11 @@ %1$s. %2$s - - On / %1$s + + On / %1$s - - On + + On Ask every time @@ -8626,25 +8626,25 @@ } - - What can interrupt Do Not Disturb - - People - - Apps - - Alarms & other interruptions - - Schedules - - Duration for Quick Settings - + Notifications that can reach you + + People + + Apps + + Alarms & other notifications + + Schedules + + Duration for Quick Settings + - General + Advanced - - When Do Not Disturb is on, sound and vibration will be muted, except for the items you allow above. + + When Priority mode is on, sound and vibration will be muted, except for the items you allow above. Custom settings @@ -8659,8 +8659,8 @@ Messages, events & reminders - - 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. + + 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. Done @@ -8676,8 +8676,8 @@ (Current setting) - - Change Do Not Disturb notification settings? + + Change Priority mode 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 @@ -9103,7 +9103,7 @@ Bubble priority conversations - Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb. + Priority conversations show at the top of the pull-down shade. You can also set them to bubble when Priority mode is on. Priority and modified conversations will appear here @@ -9247,12 +9247,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 Do Not Disturb. + such as answering phone calls, and control Priority mode. - + %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 Do Not Disturb on or off and change related settings. + \n\nThis will also give the app the ability to turn Priority mode on or off and change related settings. %1$s will be able to: Read your notifications @@ -9273,9 +9273,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 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. + 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. Turn off Cancel @@ -9438,14 +9438,14 @@ The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=NONE]--> Tap to get the app - - Do Not Disturb access + + Priority mode access - - Allow Do Not Disturb + + Allow Priority mode - - No installed apps have requested Do Not Disturb access + + No installed apps have requested Priority mode access Loading apps\u2026 @@ -9518,11 +9518,11 @@ Show notification dot - - Override Do Not Disturb + + Override Priority mode - - Let these notifications continue to interrupt when Do Not Disturb is on + + Let these notifications continue to notify you when Priority mode is on Lock screen @@ -9573,7 +9573,7 @@ Schedule name already in use - Add more + Add a schedule Add event schedule @@ -9596,26 +9596,26 @@ Unknown - - 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 (%1$s) 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. An app has automatically turned on Priority mode with custom behavior." - - These settings can\'t be changed right now. Do Not Disturb was manually turned on with custom behavior." + + These settings can\'t be changed right now. Priority mode was manually turned on with custom behavior." Time - Automatic rule set to turn on Do Not Disturb during specified times + Automatic rule set to turn on Priority mode during specified times Event - Automatic rule set to turn on Do Not Disturb during specified events + Automatic rule set to turn on Priority mode during specified events During events for @@ -9663,13 +9663,13 @@ Every day - Alarm can override end time + Use alarm as the end time - Schedule turns off when an alarm rings + Schedule turns off when next alarm rings - Do Not Disturb behavior + Customized Priority mode behavior Use default settings @@ -9708,7 +9708,7 @@ - Who can interrupt + Who can reach you Calls @@ -9717,7 +9717,7 @@ calls - Calls that can interrupt + Who can call you To make sure allowed calls make sound, check that device is set to ring @@ -9746,7 +9746,7 @@ Messages - Messages that can interrupt + Who can message you To make sure allowed messages make sound, check that device is set to ring @@ -9773,12 +9773,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 @@ -9832,14 +9832,14 @@ Allow apps to override - - Apps that can interrupt - - Select more apps - - No apps selected - - No apps can interrupt + + Apps that can notify you + + Choose more apps + + None + + No apps can notify you Add apps Some notifications - - Selected people can still reach you, even if you don\u2019t allow apps to interrupt - - + + If calling or messaging apps can\u0027t notify you, people you choose in Priority mode settings can still reach you through those apps + + {count, plural, offset:2 - =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} + =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} } @@ -9866,30 +9866,30 @@ All notifications Some notifications - - Notifications that can interrupt + + Notifications that can reach you Allow all notifications - + {count, plural, offset:2 - =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} + =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} } - - Nothing can interrupt + + None - No one can interrupt + None - Some people can interrupt + Some people can reach you - All people can interrupt + Anyone can reach you Repeat callers @@ -9948,13 +9948,13 @@ When the screen is on - Let notifications silenced by Do Not Disturb pop on screen and show a status bar icon + Let notifications silenced by Priority mode pop on screen and show a status bar icon When the screen is off - 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 and blink the light - Let notifications silenced by Do Not Disturb turn on the screen + Let notifications silenced by Priority mode turn on the screen @@ -10207,8 +10207,8 @@ Sensitive content not on lock screen Not on lock screen - - Do Not Disturb overridden + + Priority mode overridden \u00A0/\u00A0 @@ -10285,7 +10285,7 @@ Categories: Turned off - Categories: Overrides Do Not Disturb + Categories: Overrides Priority mode Advanced @@ -10729,18 +10729,18 @@ No data used - Allow access to Do Not Disturb for %1$s? + Allow access to Priority mode for %1$s? - The app will be able to turn on/off Do Not Disturb and make changes to related settings. + The app will be able to turn on/off Priority mode and make changes to related settings. Must stay turned on because notification access is on - Revoke access to Do Not Disturb for %1$s? + Revoke access to Priority mode for %1$s? - All Do Not Disturb rules created by this app will be removed. + All Priority mode rules created by this app will be removed. Don\u2019t optimize @@ -11013,8 +11013,8 @@ Networks unavailable - - Do Not Disturb is on + + Priority mode is on Phone muted @@ -12217,8 +12217,8 @@ - - Update Do Not Disturb + + Update Priority mode 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 460ae2dee32..8f31b0a3599 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("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