From 33bf636e7237bd5dc4c1ace0d0bc63004fa54bc8 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Fri, 8 May 2015 17:37:23 -0400 Subject: [PATCH] Settings: Use new EventInfo.ANY_CALENDAR constant. Bug: 20064962 Change-Id: I08a8c5feb61bfd440fc6a297d97de4abba5b19b3 --- .../settings/notification/ZenModeAutomationSettings.java | 2 +- src/com/android/settings/notification/ZenRuleNameDialog.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index 5b628444873..09af07a3130 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -211,7 +211,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { } 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 847007cc64c..984241933c0 100644 --- a/src/com/android/settings/notification/ZenRuleNameDialog.java +++ b/src/com/android/settings/notification/ZenRuleNameDialog.java @@ -165,7 +165,7 @@ public abstract class ZenRuleNameDialog { 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;