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

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

Browse Source 
am: 020117e9ba

Change-Id: I387368b20e038b9f2b920793b4b5e72064f27fd1
This commit is contained in:
Beverly
2018-03-29 16:32:07 +00:00
committed by android-build-merger
parent db29040d2a 020117e9ba
commit e711ea4afc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -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,