commit 3c4bf826e704a42ce3d460537a0adf6263c2d503
author John Spurlock <jspurlock@google.com> Fri May 08 22:29:09 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 08 22:29:10 2015 +0000
tree 84782956e910d20abce26cb853f07b6155da33bd
parent 7b9989773b1b6ffc415300c095bde51b5c90ff71
parent 33bf636e7237bd5dc4c1ace0d0bc63004fa54bc8

Merge "Settings: Use new EventInfo.ANY_CALENDAR constant." into mnc-dev

src/com/android/settings/notification/ZenModeAutomationSettings.java

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];

src/com/android/settings/notification/ZenRuleNameDialog.java

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;