Projects information

Chunk

Conflicting content
}; ((EditText) getView().findViewById(R.id.quickAddText)).setOnTouchListener(onTouch); <<<<<<< HEAD View settingsContainer = getView().findViewById(R.id.settingsContainer); settingsContainer.setVisibility(View.VISIBLE); View settingsButton = getView().findViewById(R.id.settings); settingsButton.setOnClickListener(settingsListener); View membersEdit = getView().findViewById(R.id.members_edit); membersEdit.setOnClickListener(settingsListener); getView().findViewById(R.id.listLabel).setPadding(0, 0, 0, 0); ======= View membersEdit = findViewById(R.id.members_edit); membersEdit.setOnClickListener(settingsListener); >>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e if (actFmPreferenceService.isLoggedIn()) { View activityContainer = getView().findViewById(R.id.activityContainer); activityContainer.setVisibility(View.VISIBLE);

Conflicting content

        };
        ((EditText) getView().findViewById(R.id.quickAddText)).setOnTouchListener(onTouch);

<<<<<<< HEAD
        View settingsContainer = getView().findViewById(R.id.settingsContainer);
        settingsContainer.setVisibility(View.VISIBLE);

        View settingsButton = getView().findViewById(R.id.settings);
        settingsButton.setOnClickListener(settingsListener);

        View membersEdit = getView().findViewById(R.id.members_edit);
        membersEdit.setOnClickListener(settingsListener);

        getView().findViewById(R.id.listLabel).setPadding(0, 0, 0, 0);

=======
        View membersEdit = findViewById(R.id.members_edit);
        membersEdit.setOnClickListener(settingsListener);

>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
        if (actFmPreferenceService.isLoggedIn()) {
            View activityContainer = getView().findViewById(R.id.activityContainer);
            activityContainer.setVisibility(View.VISIBLE);

Solution content
}; ((EditText) getView().findViewById(R.id.quickAddText)).setOnTouchListener(onTouch); View membersEdit = getView().findViewById(R.id.members_edit); membersEdit.setOnClickListener(settingsListener); if (actFmPreferenceService.isLoggedIn()) { View activityContainer = getView().findViewById(R.id.activityContainer); activityContainer.setVisibility(View.VISIBLE);

Solution content

        };
        ((EditText) getView().findViewById(R.id.quickAddText)).setOnTouchListener(onTouch);

        View membersEdit = getView().findViewById(R.id.members_edit);
        membersEdit.setOnClickListener(settingsListener);

        if (actFmPreferenceService.isLoggedIn()) {
            View activityContainer = getView().findViewById(R.id.activityContainer);
            activityContainer.setVisibility(View.VISIBLE);

File
TagViewActivity.java

Developer's decision
Combination

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
View activityContainer = getView().findViewById(R.id.activityContainer); activityContainer.setVisibility(View.VISIBLE); <<<<<<< HEAD ImageView activity = (ImageView) getView().findViewById(R.id.activity); ======= findViewById(R.id.listLabel).setPadding(0, 0, 0, 0); ImageView activity = (ImageView) findViewById(R.id.activity); >>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e activity.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) {

Conflicting content

            View activityContainer = getView().findViewById(R.id.activityContainer);
            activityContainer.setVisibility(View.VISIBLE);

<<<<<<< HEAD
            ImageView activity = (ImageView) getView().findViewById(R.id.activity);
=======
            findViewById(R.id.listLabel).setPadding(0, 0, 0, 0);

            ImageView activity = (ImageView) findViewById(R.id.activity);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
            activity.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {

Solution content
View activityContainer = getView().findViewById(R.id.activityContainer); activityContainer.setVisibility(View.VISIBLE); getView().findViewById(R.id.listLabel).setPadding(0, 0, 0, 0); ImageView activity = (ImageView) getView().findViewById(R.id.activity); activity.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) {

Solution content

            View activityContainer = getView().findViewById(R.id.activityContainer);
            activityContainer.setVisibility(View.VISIBLE);

            getView().findViewById(R.id.listLabel).setPadding(0, 0, 0, 0);

            ImageView activity = (ImageView) getView().findViewById(R.id.activity);
            activity.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {

File
TagViewActivity.java

Developer's decision
Manual

Kind of conflict
Cast expression
Method invocation
Variable

Chunk

Conflicting content
*/ @Override protected View getListBody(ViewGroup root) { <<<<<<< HEAD ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.task_list_body_tag_v2, root, false); ======= ViewGroup parent = (ViewGroup) getLayoutInflater().inflate(R.layout.task_list_body_tag, root, false); >>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e taskListView = super.getListBody(parent); if(actFmPreferenceService.isLoggedIn())

Conflicting content

     */
    @Override
    protected View getListBody(ViewGroup root) {
<<<<<<< HEAD
        ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.task_list_body_tag_v2, root, false);
=======
        ViewGroup parent = (ViewGroup) getLayoutInflater().inflate(R.layout.task_list_body_tag, root, false);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e

        taskListView = super.getListBody(parent);
        if(actFmPreferenceService.isLoggedIn())

Solution content
*/ @Override protected View getListBody(ViewGroup root) { ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.task_list_body_tag, root, false); taskListView = super.getListBody(parent); if(actFmPreferenceService.isLoggedIn())

Solution content

     */
    @Override
    protected View getListBody(ViewGroup root) {
        ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.task_list_body_tag, root, false);

        taskListView = super.getListBody(parent);
        if(actFmPreferenceService.isLoggedIn())

File
TagViewActivity.java

Developer's decision
Manual

Kind of conflict
Cast expression
Variable

Chunk

Conflicting content
private void showListSettingsPopover() { if (!Preferences.getBoolean(R.string.p_showed_list_settings_help, false)) { <<<<<<< HEAD View tabView = getView().findViewById(R.id.settings); HelpInfoPopover.showPopover(getActivity(), tabView, R.string.help_popover_list_settings); ======= View tabView = findViewById(R.id.members_edit); HelpInfoPopover.showPopover(this, tabView, R.string.help_popover_list_settings, null); >>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e Preferences.setBoolean(R.string.p_showed_list_settings_help, true); } }

Conflicting content

    private void showListSettingsPopover() {
        if (!Preferences.getBoolean(R.string.p_showed_list_settings_help, false)) {
<<<<<<< HEAD
            View tabView = getView().findViewById(R.id.settings);
            HelpInfoPopover.showPopover(getActivity(), tabView, R.string.help_popover_list_settings);
=======
            View tabView = findViewById(R.id.members_edit);
            HelpInfoPopover.showPopover(this, tabView, R.string.help_popover_list_settings, null);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
            Preferences.setBoolean(R.string.p_showed_list_settings_help, true);
        }
    }

Solution content
private void showListSettingsPopover() { if (!Preferences.getBoolean(R.string.p_showed_list_settings_help, false)) { View tabView = getView().findViewById(R.id.members_edit); HelpInfoPopover.showPopover(getActivity(), tabView, R.string.help_popover_list_settings, null); Preferences.setBoolean(R.string.p_showed_list_settings_help, true); } }

Solution content

    private void showListSettingsPopover() {
        if (!Preferences.getBoolean(R.string.p_showed_list_settings_help, false)) {
            View tabView = getView().findViewById(R.id.members_edit);
            HelpInfoPopover.showPopover(getActivity(), tabView, R.string.help_popover_list_settings, null);
            Preferences.setBoolean(R.string.p_showed_list_settings_help, true);
        }
    }

File
TagViewActivity.java

Developer's decision
Manual

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
import com.todoroo.astrid.helper.MetadataHelper; import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.StatisticsService; <<<<<<< HEAD ======= import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TagsPlugin; >>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e import com.todoroo.astrid.utility.Constants; /**

Conflicting content

import com.todoroo.astrid.helper.MetadataHelper;
import com.todoroo.astrid.service.StartupService;
import com.todoroo.astrid.service.StatisticsService;
<<<<<<< HEAD
=======
import com.todoroo.astrid.service.ThemeService;
import com.todoroo.astrid.tags.TagsPlugin;
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
import com.todoroo.astrid.utility.Constants;

/**

Solution content
import com.todoroo.astrid.helper.MetadataHelper; import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.tags.TagsPlugin; import com.todoroo.astrid.utility.Constants; /**

Solution content

import com.todoroo.astrid.helper.MetadataHelper;
import com.todoroo.astrid.service.StartupService;
import com.todoroo.astrid.service.StatisticsService;
import com.todoroo.astrid.tags.TagsPlugin;
import com.todoroo.astrid.utility.Constants;

/**

File
FilterListActivity.java

Developer's decision
Combination

Kind of conflict
Import

Chunk

Conflicting content
public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); <<<<<<< HEAD // Tell the framework to try to keep this fragment around // during a configuration change. setRetainInstance(true); new StartupService().onStartupApplication(getActivity()); } /* (non-Javadoc) * @see com.todoroo.astrid.fragment.ExpandableListFragment#onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle) */ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.filter_list_activity, container, false); return parent; } @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); // We have a menu item to show in action bar. setHasOptionsMenu(true); ImageView backButton = (ImageView) getView().findViewById(R.id.back); if (!getActivity().getIntent().getBooleanExtra(SHOW_BACK_BUTTON, true)) { backButton.setVisibility(View.GONE); getView().findViewById(R.id.headerLogo).setPadding(0, 0, 0, 0); } getActivity().setDefaultKeyMode(Activity.DEFAULT_KEYS_SEARCH_LOCAL); ======= setContentView(R.layout.filter_list_activity); ImageView backButton = (ImageView) findViewById(R.id.back); Button newListButton = (Button) findViewById(R.id.new_list_button); setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL); >>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e backButton.setOnClickListener(new OnClickListener() { @Override

Conflicting content

    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

<<<<<<< HEAD
        // Tell the framework to try to keep this fragment around
        // during a configuration change.
        setRetainInstance(true);

        new StartupService().onStartupApplication(getActivity());
    }

    /* (non-Javadoc)
     * @see com.todoroo.astrid.fragment.ExpandableListFragment#onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle)
     */
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
            Bundle savedInstanceState) {
        ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.filter_list_activity, container, false);
        return parent;
    }

    @Override
    public void onActivityCreated(Bundle savedInstanceState) {
        super.onActivityCreated(savedInstanceState);
        // We have a menu item to show in action bar.
        setHasOptionsMenu(true);

        ImageView backButton = (ImageView) getView().findViewById(R.id.back);
        if (!getActivity().getIntent().getBooleanExtra(SHOW_BACK_BUTTON, true)) {
            backButton.setVisibility(View.GONE);
            getView().findViewById(R.id.headerLogo).setPadding(0, 0, 0, 0);
        }
        getActivity().setDefaultKeyMode(Activity.DEFAULT_KEYS_SEARCH_LOCAL);
=======
        setContentView(R.layout.filter_list_activity);
        ImageView backButton = (ImageView) findViewById(R.id.back);
        Button newListButton = (Button) findViewById(R.id.new_list_button);
        setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e

        backButton.setOnClickListener(new OnClickListener() {
            @Override

Solution content
public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); // Tell the framework to try to keep this fragment around // during a configuration change. setRetainInstance(true); new StartupService().onStartupApplication(getActivity()); } /* (non-Javadoc) * @see com.todoroo.astrid.fragment.ExpandableListFragment#onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle) */ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.filter_list_activity, container, false); return parent; } @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); // We have a menu item to show in action bar. setHasOptionsMenu(true); getActivity().setDefaultKeyMode(Activity.DEFAULT_KEYS_SEARCH_LOCAL); ImageView backButton = (ImageView) getView().findViewById(R.id.back); Button newListButton = (Button) getView().findViewById(R.id.new_list_button); backButton.setOnClickListener(new OnClickListener() { @Override

Solution content

    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

        // Tell the framework to try to keep this fragment around
        // during a configuration change.
        setRetainInstance(true);

        new StartupService().onStartupApplication(getActivity());
    }

    /* (non-Javadoc)
     * @see com.todoroo.astrid.fragment.ExpandableListFragment#onCreateView(android.view.LayoutInflater, android.view.ViewGroup, android.os.Bundle)
     */
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
            Bundle savedInstanceState) {
        ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(R.layout.filter_list_activity, container, false);
        return parent;
    }

    @Override
    public void onActivityCreated(Bundle savedInstanceState) {
        super.onActivityCreated(savedInstanceState);
        // We have a menu item to show in action bar.
        setHasOptionsMenu(true);

        getActivity().setDefaultKeyMode(Activity.DEFAULT_KEYS_SEARCH_LOCAL);
        ImageView backButton = (ImageView) getView().findViewById(R.id.back);
        Button newListButton = (Button) getView().findViewById(R.id.new_list_button);

        backButton.setOnClickListener(new OnClickListener() {
            @Override

File
FilterListActivity.java

Developer's decision
Manual

Kind of conflict
Annotation
Cast expression
Comment
If statement
Method declaration
Method invocation
Method signature
Variable

Chunk

Conflicting content
} }); <<<<<<< HEAD onContentChanged(); ======= newListButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { Intent intent = TagsPlugin.newTagDialog(FilterListActivity.this); startActivity(intent); AndroidUtilities.callApiMethod(5, FilterListActivity.this, "overridePendingTransition", new Class[] { Integer.TYPE, Integer.TYPE }, R.anim.slide_left_in, R.anim.slide_left_out); } }); onNewIntent(getIntent()); } >>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e onNewIntent(getActivity().getIntent());

Conflicting content

            }
        });

<<<<<<< HEAD
        onContentChanged();
=======
        newListButton.setOnClickListener(new OnClickListener() {
            @Override
            public void onClick(View v) {
                Intent intent = TagsPlugin.newTagDialog(FilterListActivity.this);
                startActivity(intent);
                AndroidUtilities.callApiMethod(5, FilterListActivity.this, "overridePendingTransition",
                        new Class[] { Integer.TYPE, Integer.TYPE },
                        R.anim.slide_left_in, R.anim.slide_left_out);
            }
        });

        onNewIntent(getIntent());
    }
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e

        onNewIntent(getActivity().getIntent());

Solution content
} }); newListButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { Intent intent = TagsPlugin.newTagDialog(getActivity()); startActivity(intent); AndroidUtilities.callApiMethod(5, FilterListActivity.this, "overridePendingTransition", new Class[] { Integer.TYPE, Integer.TYPE }, R.anim.slide_left_in, R.anim.slide_left_out); } }); onContentChanged(); onNewIntent(getActivity().getIntent());

Solution content

            }
        });

        newListButton.setOnClickListener(new OnClickListener() {
            @Override
            public void onClick(View v) {
                Intent intent = TagsPlugin.newTagDialog(getActivity());
                startActivity(intent);
                AndroidUtilities.callApiMethod(5, FilterListActivity.this, "overridePendingTransition",
                        new Class[] { Integer.TYPE, Integer.TYPE },
                        R.anim.slide_left_in, R.anim.slide_left_out);
            }
        });

        onContentChanged();

        onNewIntent(getActivity().getIntent());

File
FilterListActivity.java

Developer's decision
Manual

Kind of conflict
Method invocation

Chunk

Conflicting content
/** Initialize UI components */ private void setUpUIComponents() { <<<<<<< HEAD scrollView = (ScrollView) getView().findViewById(R.id.edit_scroll); ======= setContentView(R.layout.task_edit_activity); scrollView = (ScrollView) findViewById(R.id.edit_scroll); >>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e LinearLayout basicControls = (LinearLayout) getView().findViewById(R.id.basic_controls); LinearLayout whenDialogView = (LinearLayout) LayoutInflater.from(getActivity()).inflate(R.layout.task_edit_when_controls, null);

Conflicting content

    /** Initialize UI components */
    private void setUpUIComponents() {
<<<<<<< HEAD
        scrollView = (ScrollView) getView().findViewById(R.id.edit_scroll);
=======
        setContentView(R.layout.task_edit_activity);
        scrollView = (ScrollView) findViewById(R.id.edit_scroll);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e

        LinearLayout basicControls = (LinearLayout) getView().findViewById(R.id.basic_controls);
        LinearLayout whenDialogView = (LinearLayout) LayoutInflater.from(getActivity()).inflate(R.layout.task_edit_when_controls, null);

Solution content
/** Initialize UI components */ private void setUpUIComponents() { scrollView = (ScrollView) getView().findViewById(R.id.edit_scroll); LinearLayout basicControls = (LinearLayout) getView().findViewById(R.id.basic_controls); LinearLayout whenDialogView = (LinearLayout) LayoutInflater.from(getActivity()).inflate(R.layout.task_edit_when_controls, null);

Solution content

    /** Initialize UI components */
    private void setUpUIComponents() {
        scrollView = (ScrollView) getView().findViewById(R.id.edit_scroll);

        LinearLayout basicControls = (LinearLayout) getView().findViewById(R.id.basic_controls);
        LinearLayout whenDialogView = (LinearLayout) LayoutInflater.from(getActivity()).inflate(R.layout.task_edit_when_controls, null);

File
TaskEditActivity.java

Developer's decision
Version 1

Kind of conflict
Attribute
Cast expression
Method invocation

Chunk

Conflicting content
TimerActionControlSet timerAction = new TimerActionControlSet(getActivity(), editTitle.getView()); controls.add(timerAction); <<<<<<< HEAD controls.add(peopleControlSet = new EditPeopleControlSet(getActivity(), R.layout.control_set_assigned, R.layout.control_set_assigned_display, R.string.actfm_EPA_assign_label, REQUEST_LOG_IN)); //basicControls.addView(peopleControlSet.getDisplayView()); controlSetMap.put(getString(R.string.TEA_control_who), peopleControlSet); ======= controls.add(peopleControlSet = new EditPeopleControlSet(TaskEditActivity.this, R.layout.control_set_assigned, R.layout.control_set_assigned_display, R.string.actfm_EPA_assign_label, REQUEST_LOG_IN)); controlSetMap.put(getString(R.string.TEA_ctrl_who_pref), peopleControlSet); >>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e DeadlineControlSet deadlineControl = new DeadlineControlSet(getActivity(), R.layout.control_set_deadline, R.layout.control_set_deadline_display, whenHeader, R.id.aux_date, R.id.when_shortcut_container, R.id.when_label, R.id.when_image); controls.add(deadlineControl);

Conflicting content

        TimerActionControlSet timerAction = new TimerActionControlSet(getActivity(), editTitle.getView());
        controls.add(timerAction);

<<<<<<< HEAD
        controls.add(peopleControlSet = new EditPeopleControlSet(getActivity(), R.layout.control_set_assigned, R.layout.control_set_assigned_display, R.string.actfm_EPA_assign_label, REQUEST_LOG_IN));
        //basicControls.addView(peopleControlSet.getDisplayView());
        controlSetMap.put(getString(R.string.TEA_control_who), peopleControlSet);
=======
        controls.add(peopleControlSet = new EditPeopleControlSet(TaskEditActivity.this, R.layout.control_set_assigned, R.layout.control_set_assigned_display, R.string.actfm_EPA_assign_label, REQUEST_LOG_IN));
        controlSetMap.put(getString(R.string.TEA_ctrl_who_pref), peopleControlSet);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e

        DeadlineControlSet deadlineControl = new DeadlineControlSet(getActivity(), R.layout.control_set_deadline, R.layout.control_set_deadline_display, whenHeader, R.id.aux_date, R.id.when_shortcut_container, R.id.when_label, R.id.when_image);
        controls.add(deadlineControl);

Solution content

        TimerActionControlSet timerAction = new TimerActionControlSet(getActivity(), editTitle.getView());
        controls.add(timerAction);

        controls.add(peopleControlSet = new EditPeopleControlSet(getActivity(), R.layout.control_set_assigned, R.layout.control_set_assigned_display, R.string.actfm_EPA_assign_label, REQUEST_LOG_IN));
        controlSetMap.put(getString(R.string.TEA_ctrl_who_pref), peopleControlSet);

        DeadlineControlSet deadlineControl = new DeadlineControlSet(getActivity(), R.layout.control_set_deadline, R.layout.control_set_deadline_display, whenHeader, R.id.aux_date, R.id.when_shortcut_container, R.id.when_label, R.id.when_image);
        controls.add(deadlineControl);

File
TaskEditActivity.java

Developer's decision
Combination

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content

        importanceControl.addListener(editTitle);
        controlSetMap.put(getString(R.string.TEA_ctrl_importance_pref), importanceControl);

<<<<<<< HEAD
        TagsControlSet tagsControl = new TagsControlSet(getActivity(), R.layout.control_set_tags, R.layout.control_set_tags_display, R.string.TEA_tags_label);
        controls.add(tagsControl);
        //moreControls.addView(tagsControl.getDisplayView());
        controlSetMap.put(getString(R.string.TEA_control_lists), tagsControl);
=======
        tagsControlSet = new TagsControlSet(TaskEditActivity.this, R.layout.control_set_tags, R.layout.control_set_tags_display, R.string.TEA_tags_label);
        controls.add(tagsControlSet);
        controlSetMap.put(getString(R.string.TEA_ctrl_lists_pref), tagsControlSet);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e

        notesControlSet = new EditNotesControlSet(getActivity(), R.layout.control_set_notes, R.layout.control_set_notes_display);
        notesEditText = (EditText) notesControlSet.getView().findViewById(R.id.notes);

Solution content

        importanceControl.addListener(editTitle);
        controlSetMap.put(getString(R.string.TEA_ctrl_importance_pref), importanceControl);

        tagsControlSet = new TagsControlSet(getActivity(), R.layout.control_set_tags, R.layout.control_set_tags_display, R.string.TEA_tags_label);
        controls.add(tagsControlSet);
        controlSetMap.put(getString(R.string.TEA_ctrl_lists_pref), tagsControlSet);

        notesControlSet = new EditNotesControlSet(getActivity(), R.layout.control_set_notes, R.layout.control_set_notes_display);
        notesEditText = (EditText) notesControlSet.getView().findViewById(R.id.notes);

File
TaskEditActivity.java

Developer's decision
Manual

Kind of conflict
Attribute
Comment
Method invocation
Variable

Chunk

Conflicting content

        for (int i = 0; i < itemOrder.length; i++) {
        if (orderPreference != null)
            itemOrder = orderPreference.split(BeastModePreferenceActivity.BEAST_MODE_PREF_ITEM_SEPARATOR);
        else
<<<<<<< HEAD
            itemOrder = getResources().getStringArray(R.array.TEA_control_sets);
        String moreSectionTrigger = getString(R.string.TEA_control_more_section);
        String whenViewDescriptor = getString(R.string.TEA_control_when);
        View whenView = getView().findViewById(R.id.when_container);
        String shareViewDescriptor = getString(R.string.TEA_control_share);
=======
            itemOrder = getResources().getStringArray(R.array.TEA_control_sets_prefs);
        String moreSectionTrigger = getString(R.string.TEA_ctrl_more_pref);
        String whenViewDescriptor = getString(R.string.TEA_ctrl_when_pref);
        View whenView = findViewById(R.id.when_container);
        String shareViewDescriptor = getString(R.string.TEA_ctrl_share_pref);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
        LinearLayout section = basicControls;
            String item = itemOrder[i];

Solution content

        if (orderPreference != null)
            itemOrder = orderPreference.split(BeastModePreferenceActivity.BEAST_MODE_PREF_ITEM_SEPARATOR);
        else
            itemOrder = getResources().getStringArray(R.array.TEA_control_sets_prefs);
        String moreSectionTrigger = getString(R.string.TEA_ctrl_more_pref);
        String whenViewDescriptor = getString(R.string.TEA_ctrl_when_pref);
        View whenView = getView().findViewById(R.id.when_container);
        String shareViewDescriptor = getString(R.string.TEA_ctrl_share_pref);
        LinearLayout section = basicControls;
        for (int i = 0; i < itemOrder.length; i++) {
            String item = itemOrder[i];

File
TaskEditActivity.java

Developer's decision
Combination

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content

            Button saveButtonGeneral = (Button) getView().findViewById(R.id.save);
            saveButtonGeneral.setOnClickListener(mSaveListener);

<<<<<<< HEAD
            Button saveButton2 = (Button) getView().findViewById(R.id.save2);
            Button saveButton3 = (Button) getView().findViewById(R.id.save3);
            Button saveButton4 = (Button) getView().findViewById(R.id.save4);
            if (saveButton2 != null) {
                saveButton2.setOnClickListener(mSaveListener);
            }
            if (saveButton3 != null) {
                saveButton3.setOnClickListener(mSaveListener);
            }
            if (saveButton4 != null) {
                saveButton4.setOnClickListener(mSaveListener);
            }


            Button discardButtonGeneral = (Button) getView().findViewById(R.id.discard);
            discardButtonGeneral.setOnClickListener(mDiscardListener);

            Button discardButton2 = (Button) getView().findViewById(R.id.discard2);
            Button discardButton3 = (Button) getView().findViewById(R.id.discard3);
            Button discardButton4 = (Button) getView().findViewById(R.id.discard4);
            if (discardButton2 != null) {
                discardButton2.setOnClickListener(mDiscardListener);
            }
            if (discardButton3 != null) {
                discardButton3.setOnClickListener(mDiscardListener);
            }
            if (discardButton4 != null) {
                discardButton4.setOnClickListener(mDiscardListener);
            }

            getView().findViewById(R.id.when_header).setOnClickListener(mExpandWhenListener);
=======
            Button discardButtonGeneral = (Button) findViewById(R.id.discard);
            discardButtonGeneral.setOnClickListener(mDiscardListener);

            findViewById(R.id.when_header).setOnClickListener(mExpandWhenListener);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e

            getView().findViewById(R.id.more_header).setOnClickListener(mExpandMoreListener);

Solution content

            Button saveButtonGeneral = (Button) getView().findViewById(R.id.save);
            saveButtonGeneral.setOnClickListener(mSaveListener);

            Button discardButtonGeneral = (Button) getView().findViewById(R.id.discard);
            discardButtonGeneral.setOnClickListener(mDiscardListener);

            getView().findViewById(R.id.when_header).setOnClickListener(mExpandWhenListener);

            getView().findViewById(R.id.more_header).setOnClickListener(mExpandMoreListener);

File
TaskEditActivity.java

Developer's decision
Combination

Kind of conflict
Cast expression
If statement
Method invocation
Variable

Chunk

Conflicting content

    }

    private void constructWhenDialog(View whenDialogView) {
<<<<<<< HEAD
        int theme = ThemeService.getTheme();
        if (theme == R.style.Theme || theme == R.style.Theme_Transparent) {
            whenDialog = new Dialog(getActivity(), R.style.Theme_TEA_Dialog);//R.style.Theme_WhenDialog
            //whenDialogView.setBackgroundColor(getResources().getColor(android.R.color.black));
        } else {
            whenDialog = new Dialog(getActivity(), R.style.Theme_TEA_Dialog); //R.style.Theme_White_WhenDialog
            //whenDialogView.setBackgroundColor(getResources().getColor(android.R.color.white));
        }
=======
        int theme = ThemeService.getDialogTheme();
        whenDialog = new Dialog(this, theme);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e

        Button dismissDialogButton = (Button) whenDialogView.findViewById(R.id.when_dismiss);
        dismissDialogButton.setOnClickListener(new View.OnClickListener() {

Solution content

    }

    private void constructWhenDialog(View whenDialogView) {
        int theme = ThemeService.getDialogTheme();
        whenDialog = new Dialog(getActivity(), theme);

        Button dismissDialogButton = (Button) whenDialogView.findViewById(R.id.when_dismiss);
        dismissDialogButton.setOnClickListener(new View.OnClickListener() {

File
TaskEditActivity.java

Developer's decision
Manual

Kind of conflict
Attribute
If statement
Method invocation
Variable

Chunk

Conflicting content

        dismissDialogButton.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
<<<<<<< HEAD
                DialogUtilities.dismissDialog(getActivity(), whenDialog);
=======
                showWhenShortcutHelp();
                DialogUtilities.dismissDialog(TaskEditActivity.this, whenDialog);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
            }
        });

Solution content
dismissDialogButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { showWhenShortcutHelp(); DialogUtilities.dismissDialog(getActivity(), whenDialog); } });

File
TaskEditActivity.java

Developer's decision
Combination

Kind of conflict
Method invocation

Chunk

Conflicting content

                separator.setPadding(5, 5, 5, 5);
                separator.setBackgroundResource(android.R.drawable.divider_horizontal_dark);

<<<<<<< HEAD
                LinearLayout dest = (LinearLayout)getView().findViewById(R.id.addons_more);
                dest.addView(separator);
                view.apply(getActivity(), dest);

=======
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
            } catch (Exception e) {
                exceptionService.reportError("receive-detail-" + //$NON-NLS-1$
                        intent.getStringExtra(AstridApiConstants.EXTRAS_ADDON), e);

Solution content

                separator.setPadding(5, 5, 5, 5);
                separator.setBackgroundResource(android.R.drawable.divider_horizontal_dark);

            } catch (Exception e) {
                exceptionService.reportError("receive-detail-" + //$NON-NLS-1$
                        intent.getStringExtra(AstridApiConstants.EXTRAS_ADDON), e);

File
TaskEditActivity.java

Developer's decision
Version 2

Kind of conflict
Cast expression
Method invocation
Variable

Chunk

Conflicting content

        if(Preferences.getInt(AstridPreferences.P_UPGRADE_FROM, -1) > -1)
            upgradeService.showChangeLog(getActivity(), Preferences.getInt(AstridPreferences.P_UPGRADE_FROM, -1));

<<<<<<< HEAD
        if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) {
            HelpInfoPopover.showPopover(getActivity(), quickAddBox, R.string.help_popover_add_task);
            Preferences.setBoolean(R.string.p_showed_add_task_help, true);
        }

        if(getActivity().getIntent().hasExtra(TOKEN_SOURCE)) {
            switch(getActivity().getIntent().getIntExtra(TOKEN_SOURCE, Constants.SOURCE_DEFAULT)) {
=======
        if(getIntent().hasExtra(TOKEN_SOURCE)) {
            switch(getIntent().getIntExtra(TOKEN_SOURCE, Constants.SOURCE_DEFAULT)) {
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
            case Constants.SOURCE_NOTIFICATION:
                StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_NOTIFICATION);
                break;

Solution content

        if(Preferences.getInt(AstridPreferences.P_UPGRADE_FROM, -1) > -1)
            upgradeService.showChangeLog(getActivity(), Preferences.getInt(AstridPreferences.P_UPGRADE_FROM, -1));

        if(getActivity().getIntent().hasExtra(TOKEN_SOURCE)) {
            switch(getActivity().getIntent().getIntExtra(TOKEN_SOURCE, Constants.SOURCE_DEFAULT)) {
            case Constants.SOURCE_NOTIFICATION:
                StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_NOTIFICATION);
                break;

File
TaskListActivity.java

Developer's decision
Combination

Kind of conflict
If statement
Switch statement

Chunk

Conflicting content

            isFilter = true;
        } else {
            filter = CoreFilterExposer.buildInboxFilter(getResources());
<<<<<<< HEAD
            getView().findViewById(R.id.headerLogo).setVisibility(View.VISIBLE);
            getView().findViewById(R.id.listLabel).setVisibility(View.GONE);
=======
            //findViewById(R.id.headerLogo).setVisibility(View.VISIBLE);
            //findViewById(R.id.listLabel).setVisibility(View.GONE);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
            isFilter = false;
        }

Solution content

            isFilter = true;
        } else {
            filter = CoreFilterExposer.buildInboxFilter(getResources());
            //getView().findViewById(R.id.headerLogo).setVisibility(View.VISIBLE);
            //getView().findViewById(R.id.listLabel).setVisibility(View.GONE);
            isFilter = false;
        }

File
TaskListActivity.java

Developer's decision
Manual

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content

    }

    private void setUpUiComponents() {
<<<<<<< HEAD
        ImageView backButton = (ImageView)getView().findViewById(R.id.back);
        if (backButton != null) {
            backButton.setOnClickListener(new OnClickListener() {
                public void onClick(View v) {
                    showFilterListActivity();
                }
            });
        }
=======
        ((ImageView)findViewById(R.id.back)).setOnClickListener(new OnClickListener() {
            public void onClick(View v) {
                Preferences.setBoolean(R.string.p_showed_lists_help, true);
                showFilterListActivity();
            }
        });
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e

        // set listener for quick-changing task priority
        getListView().setOnKeyListener(new OnKeyListener() {

Solution content

    }

    private void setUpUiComponents() {
        ((ImageView)getView().findViewById(R.id.back)).setOnClickListener(new OnClickListener() {
            public void onClick(View v) {
                Preferences.setBoolean(R.string.p_showed_lists_help, true);
                showFilterListActivity();
            }
        });

        // set listener for quick-changing task priority
        getListView().setOnKeyListener(new OnKeyListener() {

File
TaskListActivity.java

Developer's decision
Manual

Kind of conflict
Cast expression
If statement
Method invocation
Variable

Chunk

Conflicting content

            @Override
            public void run() {
                Preferences.setLong(LAST_AUTOSYNC_ATTEMPT, DateUtilities.now());
<<<<<<< HEAD
                new ActFmSyncProvider().synchronize(getActivity());
=======
                Flags.set(Flags.ACTFM_SUPPRESS_SYNC_TOAST);
                new ActFmSyncProvider().synchronize(TaskListActivity.this);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
            }
        }.start();
    }

Solution content

            @Override
            public void run() {
                Preferences.setLong(LAST_AUTOSYNC_ATTEMPT, DateUtilities.now());
                Flags.set(Flags.ACTFM_SUPPRESS_SYNC_TOAST);
                new ActFmSyncProvider().synchronize(getActivity());
            }
        }.start();
    }

File
TaskListActivity.java

Developer's decision
Combination

Kind of conflict
Method invocation

Chunk

Conflicting content

        super.onActivityResult(requestCode, resultCode, data);

<<<<<<< HEAD
        if(resultCode != Activity.RESULT_CANCELED) {
=======
        if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) {
            HelpInfoPopover.showPopover(TaskListActivity.this, quickAddBox, R.string.help_popover_add_task, null);
            Preferences.setBoolean(R.string.p_showed_add_task_help, true);
        }

        if(resultCode != RESULT_CANCELED) {
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
            taskAdapter.flushCaches();
            loadTaskListContent(true);
            taskService.cleanup();

Solution content

        super.onActivityResult(requestCode, resultCode, data);

        if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) {
            HelpInfoPopover.showPopover(getActivity(), quickAddBox, R.string.help_popover_add_task, null);
            Preferences.setBoolean(R.string.p_showed_add_task_help, true);
        }

        if(resultCode != Activity.RESULT_CANCELED) {
            taskAdapter.flushCaches();
            loadTaskListContent(true);
            taskService.cleanup();

File
TaskListActivity.java

Developer's decision
Manual

Kind of conflict
If statement

Chunk

Conflicting content

                public void run() {
                    final View view = getListView().getChildAt(getListView().getChildCount() - 1);
                    if (view != null) {
<<<<<<< HEAD
                        HelpInfoPopover.showPopover(getActivity(), view, R.string.help_popover_tap_task);
=======
                        OnDismissListener onDismiss = new OnDismissListener() {
                            @Override
                            public void onDismiss() {
                                if (!Preferences.getBoolean(R.string.p_showed_lists_help, false)) {
                                    Preferences.setBoolean(R.string.p_showed_lists_help, true);
                                    HelpInfoPopover.showPopover(TaskListActivity.this, findViewById(R.id.back), R.string.help_popover_lists, null);
                                }
                            }
                        };
                        HelpInfoPopover.showPopover(TaskListActivity.this, view, R.string.help_popover_tap_task, onDismiss);
>>>>>>> 626c7f5c655e9d26a15a12d78f1a44b8c06aed9e
                    }
                }
            }, 1000L);

Solution content

                public void run() {
                    final View view = getListView().getChildAt(getListView().getChildCount() - 1);
                    if (view != null) {
                        OnDismissListener onDismiss = new OnDismissListener() {
                            @Override
                            public void onDismiss() {
                                if (!Preferences.getBoolean(R.string.p_showed_lists_help, false)) {
                                    Preferences.setBoolean(R.string.p_showed_lists_help, true);
                                    HelpInfoPopover.showPopover(getActivity(), getView().findViewById(R.id.back), R.string.help_popover_lists, null);
                                }
                            }
                        };
                        HelpInfoPopover.showPopover(getActivity(), view, R.string.help_popover_tap_task, onDismiss);
                    }
                }
            }, 1000L);

File
TaskListActivity.java

Developer's decision
Manual

Kind of conflict
Method invocation
Variable

Projects >> astrid >>27010eb6cd335bddc880e54e3fbee6774e0301d7