Projects >> platform_packages_apps_calendar >>8472f9d4fd10d8bf76039a86b24683a8fc84f738

Chunk
Conflicting content
<<<<<<< HEAD
        // Turn off timestamp.
        notificationBuilder.setWhen(0);

        if (Utils.isJellybeanOrLater()) {
            notificationBuilder.setFullScreenIntent(createAlertActivityIntent(context), true);
        }

            // Should be one of the values in Notification (ie. Notification.PRIORITY_HIGH, etc).
            // A higher priority will encourage notification manager to expand it.
            notificationBuilder.setPriority(priority);
        }

=======
        PendingIntent snoozeIntent = null;
        PendingIntent emailIntent = null;
>>>>>>> 87136abfc499a96f038759c7f779e02a4c32cc35
        if (addActionButtons) {
            // Create snooze intent.  TODO: change snooze to 10 minutes.
            snoozeIntent = createSnoozeIntent(context, eventId, startMillis, endMillis,
Solution content
            notificationBuilder.setFullScreenIntent(createAlertActivityIntent(context), true);
        }

        PendingIntent snoozeIntent = null;
        PendingIntent emailIntent = null;
        if (addActionButtons) {
            // Create snooze intent.  TODO: change snooze to 10 minutes.
            snoozeIntent = createSnoozeIntent(context, eventId, startMillis, endMillis,
File
AlertReceiver.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation
Variable