| Chunk |
|---|
| Conflicting content |
|---|
import android.widget.Toast;
import com.android.calendar.alerts.AlertReceiver;
<<<<<<< HEAD
import com.android.calendar.event.EventViewUtils;
=======
import com.android.timezonepicker.TimeZoneInfo;
import com.android.timezonepicker.TimeZonePickerDialog;
import com.android.timezonepicker.TimeZonePickerDialog.OnTimeZoneSetListener;
import com.android.timezonepicker.TimeZonePickerUtils;
>>>>>>> 71b4934595bc56c3aec2a80abd3b9ff11ff4c582
public class GeneralPreferences extends PreferenceFragment implements
OnSharedPreferenceChangeListener, OnPreferenceChangeListener, OnTimeZoneSetListener { |
| Solution content |
|---|
import android.widget.Toast;
import com.android.calendar.alerts.AlertReceiver;
import com.android.calendar.event.EventViewUtils;
import com.android.timezonepicker.TimeZoneInfo;
import com.android.timezonepicker.TimeZonePickerDialog;
import com.android.timezonepicker.TimeZonePickerDialog.OnTimeZoneSetListener;
import com.android.timezonepicker.TimeZonePickerUtils;
public class GeneralPreferences extends PreferenceFragment implements
OnSharedPreferenceChangeListener, OnPreferenceChangeListener, OnTimeZoneSetListener { |
| File |
|---|
| GeneralPreferences.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
mHideDeclined = (CheckBoxPreference) preferenceScreen.findPreference(KEY_HIDE_DECLINED);
mWeekStart = (ListPreference) preferenceScreen.findPreference(KEY_WEEK_START_DAY);
mDefaultReminder = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_REMINDER);
<<<<<<< HEAD
mHomeTZ = (ListPreference) preferenceScreen.findPreference(KEY_HOME_TZ);
String tz = mHomeTZ.getValue();
mSnoozeDelay = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_SNOOZE_DELAY);
buildSnoozeDelayEntries();
=======
mHomeTZ = preferenceScreen.findPreference(KEY_HOME_TZ);
>>>>>>> 71b4934595bc56c3aec2a80abd3b9ff11ff4c582
mWeekStart.setSummary(mWeekStart.getEntry());
mDefaultReminder.setSummary(mDefaultReminder.getEntry());
mSnoozeDelay.setSummary(mSnoozeDelay.getEntry()); |
| Solution content |
|---|
mHideDeclined = (CheckBoxPreference) preferenceScreen.findPreference(KEY_HIDE_DECLINED);
mWeekStart = (ListPreference) preferenceScreen.findPreference(KEY_WEEK_START_DAY);
mDefaultReminder = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_REMINDER);
mHomeTZ = preferenceScreen.findPreference(KEY_HOME_TZ);
mSnoozeDelay = (ListPreference) preferenceScreen.findPreference(KEY_DEFAULT_SNOOZE_DELAY);
buildSnoozeDelayEntries();
mWeekStart.setSummary(mWeekStart.getEntry());
mDefaultReminder.setSummary(mDefaultReminder.getEntry());
mSnoozeDelay.setSummary(mSnoozeDelay.getEntry()); |
| File |
|---|
| GeneralPreferences.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Cast expression |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
PendingIntent mapIntent = null, callIntent = null, snoozeIntent = null, emailIntent = null;
if (addActionButtons) {
<<<<<<< HEAD
// Create snooze intent.
snoozeIntent = createSnoozeIntent(context, eventId, startMillis, endMillis,
notificationId);
=======
// Send map, call, and email intent back to ourself first for a couple reasons:
// 1) Workaround issue where clicking action button in notification does
// not automatically close the notification shade.
// 2) Event information will always be up to date.
// Create map and/or call intents.
URLSpan[] urlSpans = getURLSpans(context, eventId);
mapIntent = createMapBroadcastIntent(context, urlSpans, eventId);
callIntent = createCallBroadcastIntent(context, urlSpans, eventId);
>>>>>>> 71b4934595bc56c3aec2a80abd3b9ff11ff4c582
// Create email intent for emailing attendees.
emailIntent = createBroadcastMailIntent(context, eventId, title); |
| Solution content |
|---|
PendingIntent mapIntent = null, callIntent = null, snoozeIntent = null, emailIntent = null;
if (addActionButtons) {
// Send map, call, and email intent back to ourself first for a couple reasons:
// 1) Workaround issue where clicking action button in notification does
// not automatically close the notification shade.
// 2) Event information will always be up to date.
// Create map and/or call intents.
URLSpan[] urlSpans = getURLSpans(context, eventId);
mapIntent = createMapBroadcastIntent(context, urlSpans, eventId);
callIntent = createCallBroadcastIntent(context, urlSpans, eventId);
// Create email intent for emailing attendees.
emailIntent = createBroadcastMailIntent(context, eventId, title); |
| File |
|---|
| AlertReceiver.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
String tickerText, boolean defaultVibrate, String reminderRingtone,
boolean showLights) {
Notification notification = nw.mNotification;
<<<<<<< HEAD
// Set the lights defaults
notification.defaults |= Notification.DEFAULT_LIGHTS;
notification.flags |= Notification.FLAG_SHOW_LIGHTS;
=======
if (showLights) {
notification.flags |= Notification.FLAG_SHOW_LIGHTS;
notification.defaults |= Notification.DEFAULT_LIGHTS;
}
>>>>>>> 71b4934595bc56c3aec2a80abd3b9ff11ff4c582
// Quietly update notification bar. Nothing new. Maybe something just got deleted.
if (!quietUpdate) { |
| Solution content |
|---|
String tickerText, boolean defaultVibrate, String reminderRingtone,
boolean showLights) {
Notification notification = nw.mNotification;
if (showLights) {
notification.flags |= Notification.FLAG_SHOW_LIGHTS;
notification.defaults |= Notification.DEFAULT_LIGHTS;
}
// Quietly update notification bar. Nothing new. Maybe something just got deleted.
if (!quietUpdate) { |
| File |
|---|
| AlertService.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
public static final String EVENT_END_KEY = "eventend";
public static final String NOTIFICATION_ID_KEY = "notificationid";
public static final String EVENT_IDS_KEY = "eventids";
<<<<<<< HEAD
public static final String SNOOZE_DELAY_KEY = "snoozedelay";
=======
public static final String EVENT_STARTS_KEY = "starts";
>>>>>>> 71b4934595bc56c3aec2a80abd3b9ff11ff4c582
// A flag for using local storage to save alert state instead of the alerts DB table.
// This allows the unbundled app to run alongside other calendar apps without eating |
| Solution content |
|---|
public static final String EVENT_IDS_KEY = "eventids";
public static final String EVENT_END_KEY = "eventend";
public static final String NOTIFICATION_ID_KEY = "notificationid";
public static final String SNOOZE_DELAY_KEY = "snoozedelay";
public static final String EVENT_STARTS_KEY = "starts";
// A flag for using local storage to save alert state instead of the alerts DB table.
// This allows the unbundled app to run alongside other calendar apps without eating |
| File |
|---|
| AlertUtils.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Attribute |