Projects >> platform_packages_apps_calendar >>1ced0555cb16bab2ce105b5e1a2aa3fb207235b5

Chunk
Conflicting content
    static final int ATTENDEE_NO_RESPONSE = -1;

    private DeleteEventHelper mDeleteEventHelper;
<<<<<<< HEAD
    private CalendarController mController;
=======
    private EditResponseHelper mEditResponseHelper;

    private int mResponseOffset;
    private int mOriginalAttendeeResponse;
    private int mAttendeeResponseFromIntent = ATTENDEE_NO_RESPONSE;
    private boolean mIsRepeating;
    private boolean mIsDuplicateName;

    private Pattern mWildcardPattern = Pattern.compile("^.*$");
    private LayoutInflater mLayoutInflater;
    private LinearLayout mReminderAdder;

    // TODO This can be removed when the contacts content provider doesn't return duplicates
    private int mUpdateCounts;
    private static class ViewHolder {
        QuickContactBadge badge;
        ImageView presence;
        int updateCounts;
    }
    private HashMap mViewHolders = new HashMap();
    private PresenceQueryHandler mPresenceQueryHandler;

    private static final Uri CONTACT_DATA_WITH_PRESENCE_URI = Data.CONTENT_URI;

    int PRESENCE_PROJECTION_CONTACT_ID_INDEX = 0;
    int PRESENCE_PROJECTION_PRESENCE_INDEX = 1;
    int PRESENCE_PROJECTION_EMAIL_INDEX = 2;
    int PRESENCE_PROJECTION_PHOTO_ID_INDEX = 3;

    private static final String[] PRESENCE_PROJECTION = new String[] {
        Email.CONTACT_ID,           // 0
        Email.CONTACT_PRESENCE,     // 1
        Email.DATA,                 // 2
        Email.PHOTO_ID,             // 3
    };

    ArrayList mAcceptedAttendees = new ArrayList();
    ArrayList mDeclinedAttendees = new ArrayList();
    ArrayList mTentativeAttendees = new ArrayList();
    ArrayList mNoResponseAttendees = new ArrayList();
    private int mColor;

    // This gets run if the time zone is updated in the db
    private Runnable mUpdateTZ = new Runnable() {
        @Override
        public void run() {
            if (EventInfoActivity.this.isFinishing()) {
                return;
            }
            updateView();
        }
    };

    // This is called when one of the "remove reminder" buttons is selected.
    public void onClick(View v) {
        LinearLayout reminderItem = (LinearLayout) v.getParent();
        if (reminderItem == null) {
            return;
        }
        LinearLayout parent = (LinearLayout) reminderItem.getParent();
        if (parent == null) {
            return;
        }
        parent.removeView(reminderItem);
        mReminderItems.remove(reminderItem);
        updateRemindersVisibility();
    }

    public void onItemSelected(AdapterView parent, View v, int position, long id) {
        // If they selected the "No response" option, then don't display the
        // dialog asking which events to change.
        if (id == 0 && mResponseOffset == 0) {
            return;
        }

        // If this is not a repeating event, then don't display the dialog
        // asking which events to change.
        if (!mIsRepeating) {
            return;
        }

        // If the selection is the same as the original, then don't display the
        // dialog asking which events to change.
        int index = findResponseIndexFor(mOriginalAttendeeResponse);
        if (position == index + mResponseOffset) {
            return;
        }

        // This is a repeating event. We need to ask the user if they mean to
        // change just this one instance or all instances.
        mEditResponseHelper.showDialog(mEditResponseHelper.getWhichEvents());
    }

    public void onNothingSelected(AdapterView parent) {
    }
>>>>>>> e3eafa76592e948b60b667ae0675cd128f47ae56

    @Override
    protected void onCreate(Bundle savedInstanceState) {
Solution content
    static final int ATTENDEE_NO_RESPONSE = -1;

    private DeleteEventHelper mDeleteEventHelper;
    private CalendarController mController;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
File
EventInfoActivity.java
Developer's decision
Version 1
Kind of conflict
Attribute
Class declaration
Comment
Method declaration
Method invocation