diff options
| author | John Spurlock <jspurlock@google.com> | 2014-05-30 19:04:53 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-05-30 19:04:53 -0400 |
| commit | c2f06e06c2fbe3192da4c48045058206649b902e (patch) | |
| tree | 18e3290489ce681a1af741ed00c62e43389627a1 /src/com/android/settings | |
| parent | d711b22130cbe97c63b8f7475720c1b5098f38ed (diff) | |
| download | packages_apps_Settings-c2f06e06c2fbe3192da4c48045058206649b902e.tar.gz packages_apps_Settings-c2f06e06c2fbe3192da4c48045058206649b902e.tar.bz2 packages_apps_Settings-c2f06e06c2fbe3192da4c48045058206649b902e.zip | |
ZenSettings: Only show "next day" if start >= end time.
Bug:15345316
Change-Id: Ic1130dc639f63ae6026f7c7ba2a0ad9402557ce7
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/notification/ZenModeSettings.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index cdc4d3ae8..379b4c76c 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -281,7 +281,6 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index mEnd = new TimePickerPreference(mContext, mgr); mEnd.setKey(KEY_END_TIME); mEnd.setTitle(R.string.zen_mode_end_time); - mEnd.setSummaryFormat(R.string.zen_mode_end_time_summary_format); mEnd.setCallback(new TimePickerPreference.Callback() { @Override public boolean onSetTime(int hour, int minute) { @@ -326,6 +325,13 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index updateControls(); } + private void updateEndSummary() { + 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); + } + private void updateControls() { mDisableListeners = true; if (mCalls != null) { @@ -338,6 +344,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index mEnd.setTime(mConfig.sleepEndHour, mConfig.sleepEndMinute); mDisableListeners = false; refreshAutomationSection(); + updateEndSummary(); } private void refreshAutomationSection() { @@ -440,6 +447,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index if (success) { mConfig = config; if (DEBUG) Log.d(TAG, "Saved mConfig=" + mConfig); + updateEndSummary(); } return success; } catch (Exception e) { |