| commit | 33bf636e7237bd5dc4c1ace0d0bc63004fa54bc8 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Fri May 08 17:37:23 2015 -0400 |
| committer | John Spurlock <jspurlock@google.com> | Fri May 08 17:37:23 2015 -0400 |
| tree | 3833a93481a2f2f4e214ab22460282e90b943183 | |
| parent | c0df6623a0eb0ebbdb965111269b96d9f4a4b976 [diff] |
Settings: Use new EventInfo.ANY_CALENDAR constant. Bug: 20064962 Change-Id: I08a8c5feb61bfd440fc6a297d97de4abba5b19b3
diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index 5b62844..09af07a 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java
@@ -211,7 +211,7 @@ } private String computeCalendarName(EventInfo event) { - if (event.calendar != 0) { + if (event.calendar != EventInfo.ANY_CALENDAR) { final CalendarInfo[] calendars = ZenModeEventRuleSettings.getCalendars(mContext); for (int i = 0; i < calendars.length; i++) { final CalendarInfo calendar = calendars[i];
diff --git a/src/com/android/settings/notification/ZenRuleNameDialog.java b/src/com/android/settings/notification/ZenRuleNameDialog.java index 847007c..9842419 100644 --- a/src/com/android/settings/notification/ZenRuleNameDialog.java +++ b/src/com/android/settings/notification/ZenRuleNameDialog.java
@@ -165,7 +165,7 @@ private static RuleInfo defaultNewEvent() { final EventInfo event = new EventInfo(); - event.calendar = 0; // any + event.calendar = EventInfo.ANY_CALENDAR; event.reply = EventInfo.REPLY_ANY_EXCEPT_NO; final RuleInfo rt = new RuleInfo(); rt.settingsAction = ZenModeEventRuleSettings.ACTION;