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

Settings: Update preference summary per new downtime behavior.

Browse Source 
Bug: 16373455
Change-Id: I399b23ed09973c32c60b37612fd714198297b1a7
This commit is contained in:
John Spurlock
2014-11-10 14:49:10 -05:00
parent 76f0133831
commit 49300d19ab
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -5894,8 +5894,14 @@
<!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
<string name="zen_mode_end_time">End time</string>
<!-- [CHAR LIMIT=20] Zen mode settings: End time option: Summary text value format -->
<string name="zen_mode_end_time_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day</string>
<!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = priority and end time = next day -->
<string name="zen_mode_end_time_priority_next_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day</string>
<!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = none and end time = same day -->
<string name="zen_mode_end_time_none_same_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> or any alarm before</string>
<!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when downtime mode = none and end time = next day -->
<string name="zen_mode_end_time_none_next_day_summary_format"><xliff:g id="formatted_time">%s</xliff:g> next day or any alarm before</string>
<!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
<string name="notification_settings_apps_title">App notifications</string>

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