Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c4bf826 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

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

parents 7b998977 33bf636e

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

+1 −1
Original line number Diff line number Diff line
@@ -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];

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

+1 −1
Original line number Diff line number Diff line
@@ -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;