PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev

Browse Source
This commit is contained in:
John Spurlock
2014-11-11 02:22:18 +00:00
committed by Android (Google) Code Review
parent ded5a85aad 49300d19ab
commit 64cb79bb69
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -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() {