diff options
| author | John Spurlock <jspurlock@google.com> | 2015-05-29 12:04:21 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2015-05-29 12:18:34 -0400 |
| commit | 8be53eaaf7b2dcc5617c6ed6bef14d15cbe9e28d (patch) | |
| tree | 65157a18d1fe40bf128b272bcf1771b57d6d7a4e /packages/SystemUI/res/values | |
| parent | f40d08f8a3094ac5d5478efc5de0b96f57d2c5df (diff) | |
| download | frameworks_base-8be53eaaf7b2dcc5617c6ed6bef14d15cbe9e28d.zip frameworks_base-8be53eaaf7b2dcc5617c6ed6bef14d15cbe9e28d.tar.gz frameworks_base-8be53eaaf7b2dcc5617c6ed6bef14d15cbe9e28d.tar.bz2 | |
Zen: Add warning text if total silence will eat the next alarm.
Bug: 21359239
Change-Id: I8a69738e6488f40f24eed622529c913b6c3865a0
Diffstat (limited to 'packages/SystemUI/res/values')
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 13 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 5 |
2 files changed, 18 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 5b1a5b3..d96ed96 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1044,4 +1044,17 @@ <string name="regrettable_lack_of_easter_egg"> ¯\\_(ツ)_/¯ </string> + + <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] --> + <string name="zen_alarm_warning_indef">You won\'t hear your next alarm <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g> unless you turn this off before then</string> + + <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] --> + <string name="zen_alarm_warning">You won\'t hear your next alarm <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g></string> + + <!-- Alarm template for near alarms [CHAR LIMIT=25] --> + <string name="alarm_template">at <xliff:g id="when" example="7:00 AM">%1$s</xliff:g></string> + + <!-- Alarm template for far alarms [CHAR LIMIT=25] --> + <string name="alarm_template_far">on <xliff:g id="when" example="Fri 7:00 AM">%1$s</xliff:g></string> + </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 6709095..bda39b1 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -142,6 +142,11 @@ <item name="android:textSize">14sp</item> </style> + <style name="TextAppearance.QS.Warning"> + <item name="android:textSize">14sp</item> + <item name="android:textColor">@color/system_warning_color</item> + </style> + <style name="TextAppearance.QS.DetailButton"> <item name="android:textSize">@dimen/qs_detail_button_text_size</item> <item name="android:textColor">@color/qs_detail_button</item> |