Projects >> Dindy >>dc60fd20ed76c1d8f10b84c07b39b065438f9a5f

Chunk
Conflicting content 
        public static final int startup_message_dialog=0x7f030004;
    }
    public static final class string {
<<<<<<< HEAD
        public static final int app_name=0x7f050000;
        public static final int default_profile_away_name=0x7f050045;
        public static final int default_profile_away_sms_message=0x7f050046;
        public static final int default_profile_busy_name=0x7f050047;
        public static final int default_profile_busy_sms_message=0x7f050048;
        public static final int default_profile_car_name=0x7f050037;
        public static final int default_profile_car_sms_message=0x7f050038;
        public static final int default_profile_meeting_name=0x7f050039;
        public static final int default_profile_meeting_sms_message=0x7f05003a;
        public static final int default_profile_night_name=0x7f05003b;
        public static final int default_profile_night_sms_message=0x7f05003c;
        public static final int dialog_profile_name_cancel=0x7f050017;
        public static final int dialog_profile_name_new_name=0x7f050015;
        public static final int dialog_profile_name_ok=0x7f050016;
        public static final int dialog_profile_name_rename_title_prefix=0x7f050018;
        public static final int dindy_service_label=0x7f050002;
        public static final int dindy_service_started=0x7f050001;
        public static final int help_dialog_ok_text=0x7f050040;
        public static final int help_dialog_text=0x7f05003f;
        public static final int help_dialog_title=0x7f050041;
        public static final int locale_plugin_name=0x7f050049;
        public static final int main_button_add_new_profile=0x7f050025;
        public static final int main_button_select_profile=0x7f050023;
        public static final int main_help_button_text=0x7f05003e;
        public static final int main_menu_preferences=0x7f050044;
        public static final int main_no_available_profile=0x7f050024;
        public static final int main_preferences=0x7f05001f;
        public static final int main_profile=0x7f050043;
        public static final int main_start=0x7f05001d;
        public static final int main_stop=0x7f05001e;
        public static final int preferences_main=0x7f050006;
        public static final int preferences_name=0x7f05000b;
        public static final int preferences_new_profile=0x7f050004;
        public static final int preferences_new_profile_summary=0x7f050005;
        public static final int preferences_profile_call_settings=0x7f05002d;
        public static final int preferences_profile_editor=0x7f050003;
        public static final int preferences_profile_enable_sms_sending_summary=0x7f050031;
        public static final int preferences_profile_enable_sms_sending_title=0x7f050026;
        public static final int preferences_profile_first_ring=0x7f050007;
        public static final int preferences_profile_first_ring_flash=0x7f05000a;
        public static final int preferences_profile_first_ring_sound=0x7f050008;
        public static final int preferences_profile_first_ring_vibrate=0x7f050009;
        public static final int preferences_profile_list_preference_current_prefix=0x7f050033;
        public static final int preferences_profile_menu_cancel=0x7f050028;
        public static final int preferences_profile_menu_delete=0x7f050021;
        public static final int preferences_profile_menu_done=0x7f050022;
        public static final int preferences_profile_menu_rename=0x7f050020;
        public static final int preferences_profile_second_ring=0x7f05000d;
        public static final int preferences_profile_second_ring_flash=0x7f050010;
        public static final int preferences_profile_second_ring_sound=0x7f05000e;
        public static final int preferences_profile_second_ring_vibrate=0x7f05000f;
        public static final int preferences_profile_sms=0x7f050027;
        public static final int preferences_profile_sms_message=0x7f05001b;
        public static final int preferences_profile_sms_message_default_unset_value=0x7f05001c;
        public static final int preferences_profile_time_between_calls=0x7f050029;
        public static final int preferences_profile_time_between_calls_dialog_title=0x7f05002a;
        public static final int preferences_profile_time_between_calls_summary=0x7f05002c;
        public static final int preferences_profile_time_between_calls_title=0x7f05002b;
        public static final int preferences_profile_unknown_caller_behavior_dialog_title=0x7f05002f;
        public static final int preferences_profile_unknown_caller_behavior_summary=0x7f050032;
        public static final int preferences_profile_unknown_caller_behavior_title=0x7f050030;
        public static final int preferences_profiles_list=0x7f050011;
        public static final int preferences_profiles_list_context_menu_delete=0x7f050014;
        public static final int preferences_profiles_list_context_menu_edit=0x7f050012;
        public static final int preferences_profiles_list_context_menu_rename=0x7f050013;
        public static final int preferences_profiles_list_context_menu_select=0x7f050019;
        public static final int preferences_profiles_list_item_new=0x7f050042;
        public static final int preferences_profiles_list_menu_new=0x7f05001a;
        public static final int preferences_profiles_list_no_profiles_text=0x7f05002e;
        public static final int preferences_profiles_list_summary=0x7f05000c;
        public static final int startup_message_dialog_checkbox_text=0x7f050034;
        public static final int startup_message_dialog_ok_text=0x7f050036;
        public static final int startup_message_dialog_text=0x7f050035;
        public static final int startup_message_dialog_title=0x7f05003d;
=======
        public static final int app_name=0x7f060000;
        public static final int app_widget_profile_deleted=0x7f06004b;
        public static final int default_profile_away_name=0x7f060045;
        public static final int default_profile_away_sms_message=0x7f060046;
        public static final int default_profile_busy_name=0x7f060047;
        public static final int default_profile_busy_sms_message=0x7f060048;
        public static final int default_profile_car_name=0x7f060037;
        public static final int default_profile_car_sms_message=0x7f060038;
        public static final int default_profile_meeting_name=0x7f060039;
        public static final int default_profile_meeting_sms_message=0x7f06003a;
        public static final int default_profile_night_name=0x7f06003b;
        public static final int default_profile_night_sms_message=0x7f06003c;
        public static final int dialog_profile_name_cancel=0x7f060017;
        public static final int dialog_profile_name_new_name=0x7f060015;
        public static final int dialog_profile_name_ok=0x7f060016;
        public static final int dialog_profile_name_rename_title_prefix=0x7f060018;
        public static final int dindy_service_label=0x7f060002;
        public static final int dindy_service_started=0x7f060001;
        public static final int help_dialog_ok_text=0x7f060040;
        public static final int help_dialog_text=0x7f06003f;
        public static final int help_dialog_title=0x7f060041;
        public static final int main_button_add_new_profile=0x7f060025;
        public static final int main_button_select_profile=0x7f060023;
        public static final int main_help_button_text=0x7f06003e;
        public static final int main_menu_preferences=0x7f060044;
        public static final int main_no_available_profile=0x7f060024;
        public static final int main_preferences=0x7f06001f;
        public static final int main_profile=0x7f060043;
        public static final int main_start=0x7f06001d;
        public static final int main_stop=0x7f06001e;
        public static final int preferences_all_profiles_app_widget_name=0x7f06004a;
        public static final int preferences_main=0x7f060006;
        public static final int preferences_name=0x7f06000b;
        public static final int preferences_new_profile=0x7f060004;
        public static final int preferences_new_profile_summary=0x7f060005;
        public static final int preferences_profile_call_settings=0x7f06002d;
        public static final int preferences_profile_editor=0x7f060003;
        public static final int preferences_profile_enable_sms_sending_summary=0x7f060031;
        public static final int preferences_profile_enable_sms_sending_title=0x7f060026;
        public static final int preferences_profile_first_ring=0x7f060007;
        public static final int preferences_profile_first_ring_flash=0x7f06000a;
        public static final int preferences_profile_first_ring_sound=0x7f060008;
        public static final int preferences_profile_first_ring_vibrate=0x7f060009;
        public static final int preferences_profile_list_preference_current_prefix=0x7f060033;
        public static final int preferences_profile_menu_cancel=0x7f060028;
        public static final int preferences_profile_menu_delete=0x7f060021;
        public static final int preferences_profile_menu_done=0x7f060022;
        public static final int preferences_profile_menu_rename=0x7f060020;
        public static final int preferences_profile_second_ring=0x7f06000d;
        public static final int preferences_profile_second_ring_flash=0x7f060010;
        public static final int preferences_profile_second_ring_sound=0x7f06000e;
        public static final int preferences_profile_second_ring_vibrate=0x7f06000f;
        public static final int preferences_profile_sms=0x7f060027;
        public static final int preferences_profile_sms_message=0x7f06001b;
        public static final int preferences_profile_sms_message_default_unset_value=0x7f06001c;
        public static final int preferences_profile_time_between_calls=0x7f060029;
        public static final int preferences_profile_time_between_calls_dialog_title=0x7f06002a;
        public static final int preferences_profile_time_between_calls_summary=0x7f06002c;
        public static final int preferences_profile_time_between_calls_title=0x7f06002b;
        public static final int preferences_profile_unknown_caller_behavior_dialog_title=0x7f06002f;
        public static final int preferences_profile_unknown_caller_behavior_summary=0x7f060032;
        public static final int preferences_profile_unknown_caller_behavior_title=0x7f060030;
        public static final int preferences_profiles_list=0x7f060011;
        public static final int preferences_profiles_list_context_menu_delete=0x7f060014;
        public static final int preferences_profiles_list_context_menu_edit=0x7f060012;
        public static final int preferences_profiles_list_context_menu_rename=0x7f060013;
        public static final int preferences_profiles_list_context_menu_select=0x7f060019;
        public static final int preferences_profiles_list_item_new=0x7f060042;
        public static final int preferences_profiles_list_menu_new=0x7f06001a;
        public static final int preferences_profiles_list_no_profiles_text=0x7f06002e;
        public static final int preferences_profiles_list_summary=0x7f06000c;
        public static final int preferences_single_profile_app_widget_name=0x7f060049;
        public static final int startup_message_dialog_checkbox_text=0x7f060034;
        public static final int startup_message_dialog_ok_text=0x7f060036;
        public static final int startup_message_dialog_text=0x7f060035;
        public static final int startup_message_dialog_title=0x7f06003d;
    }
    public static final class xml {
        public static final int single_profile_appwidget_provider=0x7f040000;
>>>>>>> b8530462a352175c0154535b68618ab4460d45e6
    }
}
Solution content 
        public static final int startup_message_dialog=0x7f030004;
    }
    public static final class string {
        public static final int app_name=0x7f060000;
        public static final int app_widget_profile_deleted=0x7f06004c;
        public static final int default_profile_away_name=0x7f060045;
        public static final int default_profile_away_sms_message=0x7f060046;
        public static final int default_profile_busy_name=0x7f060047;
        public static final int default_profile_busy_sms_message=0x7f060048;
        public static final int default_profile_car_name=0x7f060037;
        public static final int default_profile_car_sms_message=0x7f060038;
        public static final int default_profile_meeting_name=0x7f060039;
        public static final int default_profile_meeting_sms_message=0x7f06003a;
        public static final int default_profile_night_name=0x7f06003b;
        public static final int default_profile_night_sms_message=0x7f06003c;
        public static final int dialog_profile_name_cancel=0x7f060017;
        public static final int dialog_profile_name_new_name=0x7f060015;
        public static final int dialog_profile_name_ok=0x7f060016;
        public static final int dialog_profile_name_rename_title_prefix=0x7f060018;
        public static final int dindy_service_label=0x7f060002;
        public static final int dindy_service_started=0x7f060001;
        public static final int help_dialog_ok_text=0x7f060040;
        public static final int help_dialog_text=0x7f06003f;
        public static final int help_dialog_title=0x7f060041;
        public static final int locale_plugin_name=0x7f060049;
        public static final int main_button_add_new_profile=0x7f060025;
        public static final int main_button_select_profile=0x7f060023;
        public static final int main_help_button_text=0x7f06003e;
        public static final int main_menu_preferences=0x7f060044;
        public static final int main_no_available_profile=0x7f060024;
        public static final int main_preferences=0x7f06001f;
        public static final int main_profile=0x7f060043;
        public static final int main_start=0x7f06001d;
        public static final int main_stop=0x7f06001e;
        public static final int preferences_all_profiles_app_widget_name=0x7f06004b;
        public static final int preferences_main=0x7f060006;
        public static final int preferences_name=0x7f06000b;
        public static final int preferences_new_profile=0x7f060004;
        public static final int preferences_new_profile_summary=0x7f060005;
        public static final int preferences_profile_call_settings=0x7f06002d;
        public static final int preferences_profile_editor=0x7f060003;
        public static final int preferences_profile_enable_sms_sending_summary=0x7f060031;
        public static final int preferences_profile_enable_sms_sending_title=0x7f060026;
        public static final int preferences_profile_first_ring=0x7f060007;
        public static final int preferences_profile_first_ring_flash=0x7f06000a;
        public static final int preferences_profile_first_ring_sound=0x7f060008;
        public static final int preferences_profile_first_ring_vibrate=0x7f060009;
        public static final int preferences_profile_list_preference_current_prefix=0x7f060033;
        public static final int preferences_profile_menu_cancel=0x7f060028;
        public static final int preferences_profile_menu_delete=0x7f060021;
        public static final int preferences_profile_menu_done=0x7f060022;
        public static final int preferences_profile_menu_rename=0x7f060020;
        public static final int preferences_profile_second_ring=0x7f06000d;
        public static final int preferences_profile_second_ring_flash=0x7f060010;
        public static final int preferences_profile_second_ring_sound=0x7f06000e;
        public static final int preferences_profile_second_ring_vibrate=0x7f06000f;
        public static final int preferences_profile_sms=0x7f060027;
        public static final int preferences_profile_sms_message=0x7f06001b;
        public static final int preferences_profile_sms_message_default_unset_value=0x7f06001c;
        public static final int preferences_profile_time_between_calls=0x7f060029;
        public static final int preferences_profile_time_between_calls_dialog_title=0x7f06002a;
        public static final int preferences_profile_time_between_calls_summary=0x7f06002c;
        public static final int preferences_profile_time_between_calls_title=0x7f06002b;
        public static final int preferences_profile_unknown_caller_behavior_dialog_title=0x7f06002f;
        public static final int preferences_profile_unknown_caller_behavior_summary=0x7f060032;
        public static final int preferences_profile_unknown_caller_behavior_title=0x7f060030;
        public static final int preferences_profiles_list=0x7f060011;
        public static final int preferences_profiles_list_context_menu_delete=0x7f060014;
        public static final int preferences_profiles_list_context_menu_edit=0x7f060012;
        public static final int preferences_profiles_list_context_menu_rename=0x7f060013;
        public static final int preferences_profiles_list_context_menu_select=0x7f060019;
        public static final int preferences_profiles_list_item_new=0x7f060042;
        public static final int preferences_profiles_list_menu_new=0x7f06001a;
        public static final int preferences_profiles_list_no_profiles_text=0x7f06002e;
        public static final int preferences_profiles_list_summary=0x7f06000c;
        public static final int preferences_single_profile_app_widget_name=0x7f06004a;
        public static final int startup_message_dialog_checkbox_text=0x7f060034;
        public static final int startup_message_dialog_ok_text=0x7f060036;
        public static final int startup_message_dialog_text=0x7f060035;
        public static final int startup_message_dialog_title=0x7f06003d;
    }
    public static final class xml {
        public static final int single_profile_appwidget_provider=0x7f040000;
    }
}
File
R.java
Developer's decision
Manual
Kind of conflict
Attribute
Class signature
Chunk
Conflicting content 
		}
	}
<<<<<<< HEAD
	
	public static final long NOT_A_PROFILE_ID = -1;
=======
	/*
	class Action
	{
		static final String PROFILE_STARTED =
			"net.gnobal.dindy.action.PROFILE_STARTED";
		static final String PROFILE_STOPPED =
			"net.gnobal.dindy.action.PROFILE_STARTED";
	}*/
	static final long NOT_A_PROFILE_ID = -1;
>>>>>>> b8530462a352175c0154535b68618ab4460d45e6
	static final long INFINITE_TIME = -1;
	static final long MILLIS_IN_MINUTE = 60000;
	static final String LOGTAG = "Dindy";
Solution content 
		}
	}

	/*
	class Action
	{
		static final String PROFILE_STARTED =
			"net.gnobal.dindy.action.PROFILE_STARTED";
		static final String PROFILE_STOPPED =
			"net.gnobal.dindy.action.PROFILE_STARTED";
	}*/
	public static final long NOT_A_PROFILE_ID = -1;
	static final long INFINITE_TIME = -1;
	static final long MILLIS_IN_MINUTE = 60000;
	static final String LOGTAG = "Dindy";
File
Consts.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
		return super.onContextItemSelected(item);
	}

<<<<<<< HEAD
	public static final String EXTRA_MODE_NAME = "mode";
	public static final int EXTRA_MODE_SELECT = 0;
	public static final int EXTRA_MODE_EDIT = 1;
=======
	static final String EXTRA_MODE_NAME = "mode";
	static final int EXTRA_MODE_SELECT = 1;
	static final int EXTRA_MODE_EDIT = 2;
	static final String EXTRA_SELECTED_PROFILE_ID = 
		"selected_profile_id";
>>>>>>> b8530462a352175c0154535b68618ab4460d45e6

	@Override
	protected void onPrepareDialog(int id, Dialog dialog) {
Solution content 
		return super.onContextItemSelected(item);
	}

	public static final String EXTRA_MODE_NAME = "mode";
	public static final int EXTRA_MODE_SELECT = 1;
	public static final int EXTRA_MODE_EDIT = 2;

	@Override
	protected void onPrepareDialog(int id, Dialog dialog) {
File
ProfilesListActivity.java
Developer's decision
Manual
Kind of conflict
Attribute