Projects >> android_packages_apps_Calendar >>b2b44895892828ea0e45b4f5287e26756b158555

Chunk
Conflicting content 
        if (id != -1) {
            // Switch to the EventInfo view
            EventInfo event = mWindowAdapter.getEventByPosition(position);
<<<<<<< HEAD:src/com/android/calendar/agenda/AgendaListView.java
            long oldInstanceId = mWindowAdapter.getSelectedInstanceId();
            mWindowAdapter.setSelectedView(v);
            if (event != null && oldInstanceId != mWindowAdapter.getSelectedInstanceId()) {
                CalendarController.getInstance(mContext).sendEventRelatedEvent(this,
                        EventType.VIEW_EVENT, event.id, event.begin, event.end, 0, 0, -1);
=======
            if (event != null) {
                Uri uri = ContentUris.withAppendedId(Events.CONTENT_URI, event.id);
                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
                long begin = event.begin;
                long end = event.end;
                if (event.allday) {
                    String tz = Utils.getTimeZone(mContext, null);
                    Time time = new Time(tz);
                    time.set(begin);
                    time.timezone = Time.TIMEZONE_UTC;
                    begin = time.toMillis(true /* use isDst */);
                    time.timezone = tz;
                    time.set(end);
                    time.timezone = Time.TIMEZONE_UTC;
                    end = time.toMillis(true);
                }
                intent.putExtra(Calendar.EVENT_BEGIN_TIME, begin);
                intent.putExtra(Calendar.EVENT_END_TIME, end);
                mAgendaActivity.startActivity(intent);
>>>>>>> 919dcfdc4ad8d570c0302868238b2d8f8d1af113:src/com/android/calendar/AgendaListView.java
            }
        }
    }
Solution content 
        if (id != -1) {
            // Switch to the EventInfo view
            EventInfo event = mWindowAdapter.getEventByPosition(position);
            long oldInstanceId = mWindowAdapter.getSelectedInstanceId();
            mWindowAdapter.setSelectedView(v);
            if (event != null && oldInstanceId != mWindowAdapter.getSelectedInstanceId()) {
                CalendarController.getInstance(mContext).sendEventRelatedEvent(this,
                        EventType.VIEW_EVENT, event.id, event.begin, event.end, 0, 0, -1);
            }
        }
    }
File
AgendaListView.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
        long begin;
        long end;
        long id;
<<<<<<< HEAD:src/com/android/calendar/agenda/AgendaWindowAdapter.java
        int startDay;
=======

        boolean allday;
>>>>>>> 919dcfdc4ad8d570c0302868238b2d8f8d1af113:src/com/android/calendar/AgendaWindowAdapter.java
    }

    static class DayAdapterInfo {
Solution content 
        long begin;
        long end;
        long id;
        int startDay;
    }

    static class DayAdapterInfo {
File
AgendaWindowAdapter.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
            isDayHeader = true;
        }

<<<<<<< HEAD:src/com/android/calendar/agenda/AgendaWindowAdapter.java
        if (cursorPosition < info.cursor.getCount()) {
            info.cursor.moveToPosition(cursorPosition);
            return buildEventInfoFromCursor(info.cursor, isDayHeader);
=======
        if (position < info.cursor.getCount()) {
            info.cursor.moveToPosition(position);
            event.begin = info.cursor.getLong(AgendaWindowAdapter.INDEX_BEGIN);
            boolean allDay = info.cursor.getInt(AgendaWindowAdapter.INDEX_ALL_DAY) != 0;

            event.allday = allDay;
            if (!isDayHeader) {
                event.end = info.cursor.getLong(AgendaWindowAdapter.INDEX_END);
                event.id = info.cursor.getLong(AgendaWindowAdapter.INDEX_EVENT_ID);
            }
            if (allDay) { // UTC
                Time time = new Time(Utils.getTimeZone(mContext, mUpdateTZ));
                time.setJulianDay(Time.getJulianDay(event.begin, 0));
                event.begin = time.toMillis(true /* use isDst */);
                if (!isDayHeader) {
                    time.setJulianDay(Time.getJulianDay(event.end, 0));
                    event.end = time.toMillis(true);
                }
            } else if (isDayHeader) { // Trim to midnight.
                Time time = new Time(Utils.getTimeZone(mContext, mUpdateTZ));
                time.set(event.begin);
                time.hour = 0;
                time.minute = 0;
                time.second = 0;
                event.begin = time.toMillis(false /* use isDst */);
            }

            return event;
>>>>>>> 919dcfdc4ad8d570c0302868238b2d8f8d1af113:src/com/android/calendar/AgendaWindowAdapter.java
        }
        return null;
    }
Solution content 
            isDayHeader = true;
        }

        if (cursorPosition < info.cursor.getCount()) {
            info.cursor.moveToPosition(cursorPosition);
            return buildEventInfoFromCursor(info.cursor, isDayHeader);
        }
        return null;
    }
File
AgendaWindowAdapter.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Method invocation
Return statement
Variable