PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df am: e0b855898a

Browse Source 
Change-Id: I1d271b9fb31b38f874d6459daa5b9c7b67a8d22b
This commit is contained in:
TreeHugger Robot
2020-04-27 18:22:24 +00:00
committed by Automerger Merge Worker
parent 2ac1f2cfa7 e0b855898a
commit a0823cbb6c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -8990,8 +8990,11 @@
<!-- [CHAR LIMIT=NONE] Zen mode custom rule settings: Messages screen footer -->
<string name="zen_mode_custom_messages_footer">For \u2018<xliff:g id="schedule_name" example="Schedule 1">%1$s</xliff:g>\u2019 incoming messages are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.</string>
<!-- Zen mode settings: All senders can bypass DND summary [CHAR LIMIT=NONE -->
<string name="zen_mode_all_senders_summary">All <xliff:g id="sender_category" example="messages">%s</xliff:g> can reach you</string>
<!-- Zen mode settings: All messages can bypass DND summary [CHAR LIMIT=NONE -->
<string name="zen_mode_all_messages_summary">All messages can reach you</string>
<!-- Zen mode settings: All calls can bypass DND summary [CHAR LIMIT=NONE -->
<string name="zen_mode_all_calls_summary">All calls can reach you</string>
<!-- Zen mode settings: Senders in contacts can bypass DND summary summary [CHAR LIMIT=NONE -->
<string name="zen_mode_contacts_senders_summary"><xliff:g id="num_contacts" example="120">%d</xliff:g> contacts</string>

7
src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java
View File

@@ -150,10 +150,9 @@ public class ZenModePrioritySendersPreferenceController
case KEY_CONTACTS:
return mBackend.getContactsNumberSummary(mContext);
case KEY_ANY:
return mContext.getResources().getString(R.string.zen_mode_all_senders_summary,
mContext.getResources().getString(mIsMessages
? R.string.zen_mode_messages_list
: R.string.zen_mode_calls_list));
return mContext.getResources().getString(mIsMessages
? R.string.zen_mode_all_messages_summary
: R.string.zen_mode_all_calls_summary);
case KEY_NONE:
default:
return null;