From 8be53eaaf7b2dcc5617c6ed6bef14d15cbe9e28d Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Fri, 29 May 2015 12:04:21 -0400 Subject: Zen: Add warning text if total silence will eat the next alarm. Bug: 21359239 Change-Id: I8a69738e6488f40f24eed622529c913b6c3865a0 --- packages/SystemUI/res/layout/zen_mode_panel.xml | 11 +++++++ packages/SystemUI/res/values/strings.xml | 13 ++++++++ packages/SystemUI/res/values/styles.xml | 5 +++ .../com/android/systemui/volume/ZenModePanel.java | 38 ++++++++++++++++++++++ 4 files changed, 67 insertions(+) diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index 731d4c1..43ab4bb 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -97,4 +97,15 @@ android:orientation="vertical" android:paddingBottom="@dimen/zen_mode_condition_detail_bottom_padding" /> + + + 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 @@ ¯\\_(ツ)_/¯ + + + You won\'t hear your next alarm %1$s unless you turn this off before then + + + You won\'t hear your next alarm %1$s + + + at %1$s + + + on %1$s + 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 @@ 14sp + +