diff options
| author | John Spurlock <jspurlock@google.com> | 2014-08-27 17:46:03 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-08-27 17:46:03 -0400 |
| commit | 8f8ecd620c796834a1048ec98f0e8072f5ad926c (patch) | |
| tree | 500e885a58af392145c9f4c9733b94e0a459d935 /packages/SystemUI/res/values | |
| parent | 0e917336a2e7ad8191988042800f4be443b5c69a (diff) | |
| download | frameworks_base-8f8ecd620c796834a1048ec98f0e8072f5ad926c.zip frameworks_base-8f8ecd620c796834a1048ec98f0e8072f5ad926c.tar.gz frameworks_base-8f8ecd620c796834a1048ec98f0e8072f5ad926c.tar.bz2 | |
Zen: Remove alarm warnings, color the subhead instead.
- When selecting "None" in the dialog, remove the footer warnings
about alarms, and associated bits.
- Update subhead text for "None".
- Keep track of how often "None" is used (defined as a user change
during a visible dialog session) and color the subhead text
with the warning color until it's been used five times.
Bug:17283115
Change-Id: Ief8a1c557716ec2f581b8338511432d17ac0d371
Diffstat (limited to 'packages/SystemUI/res/values')
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index e940b18..121a8bf 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -195,5 +195,8 @@ <!-- Tiles with feature timeouts: number of days to show after feature is used. --> <integer name="days_to_show_timeout_tiles">30</integer> + + <!-- Number of times to show the strong alarm warning text in the volume dialog --> + <integer name="zen_mode_alarm_warning_threshold">5</integer> </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 0fe389a..a655519 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -697,7 +697,7 @@ <string name="description_direction_left">"Slide left for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string> <!-- Zen mode: No interruptions title, with a warning about alarms. [CHAR LIMIT=60] --> - <string name="zen_no_interruptions_with_warning">No interruptions, including alarms</string> + <string name="zen_no_interruptions_with_warning">No interruptions. Not even alarms.</string> <!-- Zen mode: No interruptions. [CHAR LIMIT=40] --> <string name="zen_no_interruptions">No interruptions</string> |