Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e711ea4a authored by Beverly's avatar Beverly Committed by android-build-merger
Browse files

Merge "Settings should use Oxford comma" into pi-dev am: 51646b5f 

am: 020117e9

Change-Id: I387368b20e038b9f2b920793b4b5e72064f27fd1
parents db29040d 020117e9

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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 -->

src/com/android/settings/notification/ZenModeSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -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,