From bf4f4bf4ad6073ebab1075cd8d2e52ae8c962d74 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 28 Mar 2018 16:53:52 -0400
Subject: [PATCH] Settings should use Oxford comma

Test: manual
Change-Id: Ie4edd64d423ce96ce097e91f9f5a31bb4339774c
Fixes: 77230158
---
 res/values/strings.xml                                     | 2 +-
 src/com/android/settings/notification/ZenModeSettings.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2d530ee09cf..0ccadf5b0d2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4045,7 +4045,7 @@
     <!-- [CHAR_LIMIT=NONE] Format to put together two unrelated items in a list when "and" is not an appropriate conjunction for these 2 items -->
     <string name="join_two_unrelated_items"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="second_item">%2$s</xliff:g></string>
     <!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list -->
-    <string name="join_many_items_last"><xliff:g id="all_but_last_item">%1$s</xliff:g> and <xliff:g id="last_item">%2$s</xliff:g></string>
+    <string name="join_many_items_last"><xliff:g id="all_but_last_item">%1$s</xliff:g>, and <xliff:g id="last_item">%2$s</xliff:g></string>
     <!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list -->
     <string name="join_many_items_first"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="all_but_first_and_last_item">%2$s</xliff:g></string>
     <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 27187561618..5b85440369e 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -107,7 +107,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
             } else if (numCategories == 3){
                 String secondaryText = mContext.getString(R.string.join_two_unrelated_items,
                         enabledCategories.get(0), enabledCategories.get(1).toLowerCase());
-                return mContext.getString(R.string.join_two_items, secondaryText,
+                return mContext.getString(R.string.join_many_items_last, secondaryText,
                         enabledCategories.get(2).toLowerCase());
             } else {
                 String secondaryText = mContext.getString(R.string.join_many_items_middle,