diff --git a/res/values/strings.xml b/res/values/strings.xml
index 956ff92bd5b..ed8da6f946e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9023,8 +9023,10 @@
Alarms
From timers, alarms, security systems, and other apps
-
+
alarms
+
+ Alarms
Media sounds
@@ -9032,6 +9034,8 @@
Sounds from videos, games, and other media
media
+
+ Media
Touch sounds
@@ -9039,6 +9043,8 @@
Sounds from the keyboard and other buttons
touch sounds
+
+ Touch sounds
Reminders
@@ -9046,6 +9052,8 @@
From tasks and reminders
reminders
+
+ Reminders
Calendar events
@@ -9053,6 +9061,8 @@
From upcoming calendar events
events
+
+ Events
Allow apps to override
diff --git a/src/com/android/settings/notification/zen/ZenModeSettings.java b/src/com/android/settings/notification/zen/ZenModeSettings.java
index 7f9a4312c06..3e59203a8b9 100644
--- a/src/com/android/settings/notification/zen/ZenModeSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeSettings.java
@@ -265,19 +265,19 @@ public class ZenModeSettings extends ZenModeSettingsBase {
private String getCategory(int category, Policy policy, boolean isFirst) {
if (category == PRIORITY_CATEGORY_ALARMS) {
if (isFirst) {
- return mContext.getString(R.string.zen_mode_alarms);
+ return mContext.getString(R.string.zen_mode_alarms_list_first);
} else {
return mContext.getString(R.string.zen_mode_alarms_list);
}
} else if (category == PRIORITY_CATEGORY_MEDIA) {
if (isFirst) {
- return mContext.getString(R.string.zen_mode_media);
+ return mContext.getString(R.string.zen_mode_media_list_first);
} else {
return mContext.getString(R.string.zen_mode_media_list);
}
} else if (category == PRIORITY_CATEGORY_SYSTEM) {
if (isFirst) {
- return mContext.getString(R.string.zen_mode_system);
+ return mContext.getString(R.string.zen_mode_system_list_first);
} else {
return mContext.getString(R.string.zen_mode_system_list);
}
@@ -291,13 +291,13 @@ public class ZenModeSettings extends ZenModeSettingsBase {
}
} else if (category == Policy.PRIORITY_CATEGORY_EVENTS) {
if (isFirst) {
- return mContext.getString(R.string.zen_mode_events);
+ return mContext.getString(R.string.zen_mode_events_list_first);
} else {
return mContext.getString(R.string.zen_mode_events_list);
}
} else if (category == Policy.PRIORITY_CATEGORY_REMINDERS) {
if (isFirst) {
- return mContext.getString(R.string.zen_mode_reminders);
+ return mContext.getString(R.string.zen_mode_reminders_list_first);
} else {
return mContext.getString(R.string.zen_mode_reminders_list);
}