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

Merge "Settings: New string for zen messages summary." into mnc-dev

Browse Source
This commit is contained in:
John Spurlock
2015-05-13 19:07:51 +00:00
committed by Android (Google) Code Review
parent 78161c7375 fcfcb5ddc4
commit 07851208fc
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -6173,6 +6173,9 @@
<!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
<string name="zen_mode_messages">Messages</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Selected messages summary -->
<string name="zen_mode_selected_messages">Selected messages</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
<string name="zen_mode_from_anyone">From anyone</string>

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

@@ -82,7 +82,7 @@ public class ZenModeSettings extends ZenModeSettingsBase implements Indexable {
s = appendLowercase(s, mConfig.allowReminders, R.string.zen_mode_reminders);
s = appendLowercase(s, mConfig.allowEvents, R.string.zen_mode_events);
s = appendLowercase(s, callers, R.string.zen_mode_selected_callers);
s = appendLowercase(s, mConfig.allowMessages, R.string.zen_mode_messages);
s = appendLowercase(s, mConfig.allowMessages, R.string.zen_mode_selected_messages);
mPrioritySettings.setSummary(s);
}