From 49300d19abcde2f8bd4e8a54e57fb903805f71b6 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Mon, 10 Nov 2014 14:49:10 -0500 Subject: Settings: Update preference summary per new downtime behavior. Bug: 16373455 Change-Id: I399b23ed09973c32c60b37612fd714198297b1a7 --- src/com/android/settings/notification/ZenModeSettings.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 71ff664..99e112c 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -379,7 +379,15 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index final int startMin = 60 * mConfig.sleepStartHour + mConfig.sleepStartMinute; final int endMin = 60 * mConfig.sleepEndHour + mConfig.sleepEndMinute; final boolean nextDay = startMin >= endMin; - mEnd.setSummaryFormat(nextDay ? R.string.zen_mode_end_time_summary_format : 0); + final int summaryFormat; + if (mConfig.sleepNone) { + summaryFormat = nextDay ? R.string.zen_mode_end_time_none_next_day_summary_format + : R.string.zen_mode_end_time_none_same_day_summary_format; + } else { + summaryFormat = nextDay ? R.string.zen_mode_end_time_priority_next_day_summary_format + : 0; + } + mEnd.setSummaryFormat(summaryFormat); } private void updateControls() { -- cgit v1.1