Separate call/messages dnd summary string
The translation for call/messages may be feminine or masculine depending
on the language which changes the way this string should be translated.
Therefore, separate the string to prevent bad translations.
Test: manual
Fixes: 154687360
Change-Id: I3cbef72d41626a244ce82a0d0574427fb9c4462e
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 162d9a7..a774dd3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8989,8 +8989,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>
diff --git a/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java b/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java
index 96ddec2..8fd59c3 100644
--- a/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java
@@ -150,10 +150,9 @@
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;
