hui 2 years ago
parent 21771611d5
commit 099ebe0804

@ -1,96 +1,96 @@
#Tue Mar 28 15:47:33 CST 2023 #Fri Apr 21 16:12:44 CST 2023
net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
net.micode.notes.app-main-7\:/raw/introduction=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat net.micode.notes.app-main-7\:/raw/introduction=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\assets"/><source path="D:\programming\AndroidStudioProjects\Notes-master1\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\AndroidStudioProjects\Notes-master1\app\src\debug\assets"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\gitProject1\src\Notes-master\app\src\main\assets"/><source path="D:\programming\gitProject1\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\gitProject1\src\Notes-master\app\src\debug\assets"/></dataSet></merger>

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\AndroidStudioProjects\Notes-master1\app\src\debug\jniLibs"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\gitProject1\src\Notes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\gitProject1\src\Notes-master\app\src\debug\jniLibs"/></dataSet></merger>

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\AndroidStudioProjects\Notes-master1\app\src\debug\shaders"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\gitProject1\src\Notes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\programming\gitProject1\src\Notes-master\app\src\debug\shaders"/></dataSet></merger>

@ -1,4 +1,4 @@
#Fri Mar 31 00:11:21 CST 2023 #Fri Apr 21 16:12:55 CST 2023
base.0=D\:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex base.0=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
renamed.0=classes.dex renamed.0=classes.dex
path.0=classes.dex path.0=classes.dex

@ -20,255 +20,255 @@
20 android:versionName="0.1" > 20 android:versionName="0.1" >
21 21
22 <uses-sdk 22 <uses-sdk
22-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 22-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
23 android:minSdkVersion="14" 23 android:minSdkVersion="14"
23-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 23-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
24 android:targetSdkVersion="29" /> 24 android:targetSdkVersion="29" />
24-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 24-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
25 25
26 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 26 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
26-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
26-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
27 <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> 27 <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
27-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
27-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
28 <uses-permission android:name="android.permission.INTERNET" /> 28 <uses-permission android:name="android.permission.INTERNET" />
28-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
28-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
29 <uses-permission android:name="android.permission.READ_CONTACTS" /> 29 <uses-permission android:name="android.permission.READ_CONTACTS" />
29-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
29-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
30 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> 30 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
30-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
30-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
31 <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> 31 <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
31-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
31-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
32 <uses-permission android:name="android.permission.GET_ACCOUNTS" /> 32 <uses-permission android:name="android.permission.GET_ACCOUNTS" />
32-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
32-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
33 <uses-permission android:name="android.permission.USE_CREDENTIALS" /> 33 <uses-permission android:name="android.permission.USE_CREDENTIALS" />
33-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
33-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
34 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> 34 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
34-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
34-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
35 35
36 <application 36 <application
36-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 36-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
37 android:debuggable="true" 37 android:debuggable="true"
38 android:icon="@drawable/icon_app" 38 android:icon="@drawable/icon_app"
38-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 38-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
39 android:label="@string/app_name" 39 android:label="@string/app_name"
39-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 39-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
40 android:testOnly="true" > 40 android:testOnly="true" >
41 <activity 41 <activity
41-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 41-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20
42 android:name="net.micode.notes.ui.NotesListActivity" 42 android:name="net.micode.notes.ui.NotesListActivity"
42-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 42-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
43 android:configChanges="keyboardHidden|orientation|screenSize" 43 android:configChanges="keyboardHidden|orientation|screenSize"
43-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 43-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
44 android:label="@string/app_name" 44 android:label="@string/app_name"
44-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 44-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
45 android:launchMode="singleTop" 45 android:launchMode="singleTop"
45-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 45-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
46 android:theme="@style/NoteTheme" 46 android:theme="@style/NoteTheme"
46-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 46-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
47 android:uiOptions="splitActionBarWhenNarrow" 47 android:uiOptions="splitActionBarWhenNarrow"
47-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 47-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-57
48 android:windowSoftInputMode="adjustPan" > 48 android:windowSoftInputMode="adjustPan" >
48-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 48-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:45:13-52
49 <intent-filter> 49 <intent-filter>
49-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 49-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29
50 <action android:name="android.intent.action.MAIN" /> 50 <action android:name="android.intent.action.MAIN" />
50-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 50-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-69
50-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 50-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:48:25-66
51 51
52 <category android:name="android.intent.category.LAUNCHER" /> 52 <category android:name="android.intent.category.LAUNCHER" />
52-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 52-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:17-77
52-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 52-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:27-74
53 </intent-filter> 53 </intent-filter>
54 </activity> 54 </activity>
55 <activity 55 <activity
55-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 55-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20
56 android:name="net.micode.notes.ui.NoteEditActivity" 56 android:name="net.micode.notes.ui.NoteEditActivity"
56-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 56-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-48
57 android:configChanges="keyboardHidden|orientation|screenSize" 57 android:configChanges="keyboardHidden|orientation|screenSize"
57-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 57-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-74
58 android:launchMode="singleTop" 58 android:launchMode="singleTop"
58-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 58-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
59 android:theme="@style/NoteTheme" > 59 android:theme="@style/NoteTheme" >
59-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 59-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
60 <intent-filter android:scheme="http" > 60 <intent-filter android:scheme="http" >
60-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 60-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29
60-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:59:28-49 60-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:59:28-49
61 <action android:name="android.intent.action.VIEW" /> 61 <action android:name="android.intent.action.VIEW" />
61-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 61-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-69
61-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 61-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:60:25-66
62 62
63 <category android:name="android.intent.category.DEFAULT" /> 63 <category android:name="android.intent.category.DEFAULT" />
63-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 63-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
63-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 63-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
64 64
65 <data android:mimeType="vnd.android.cursor.item/text_note" /> 65 <data android:mimeType="vnd.android.cursor.item/text_note" />
65-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 65-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
65-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 65-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
66 <data android:mimeType="vnd.android.cursor.item/call_note" /> 66 <data android:mimeType="vnd.android.cursor.item/call_note" />
66-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 66-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
66-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 66-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
67 </intent-filter> 67 </intent-filter>
68 <intent-filter> 68 <intent-filter>
68-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 68-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29
69 <action android:name="android.intent.action.INSERT_OR_EDIT" /> 69 <action android:name="android.intent.action.INSERT_OR_EDIT" />
69-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 69-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:67:17-79
69-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 69-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:67:25-76
70 70
71 <category android:name="android.intent.category.DEFAULT" /> 71 <category android:name="android.intent.category.DEFAULT" />
71-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 71-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
71-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 71-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
72 72
73 <data android:mimeType="vnd.android.cursor.item/text_note" /> 73 <data android:mimeType="vnd.android.cursor.item/text_note" />
73-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 73-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
73-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 73-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
74 <data android:mimeType="vnd.android.cursor.item/call_note" /> 74 <data android:mimeType="vnd.android.cursor.item/call_note" />
74-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 74-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
74-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 74-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
75 </intent-filter> 75 </intent-filter>
76 <intent-filter> 76 <intent-filter>
76-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 76-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29
77 <action android:name="android.intent.action.SEARCH" /> 77 <action android:name="android.intent.action.SEARCH" />
77-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 77-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:74:17-71
77-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 77-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:74:25-68
78 78
79 <category android:name="android.intent.category.DEFAULT" /> 79 <category android:name="android.intent.category.DEFAULT" />
79-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 79-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
79-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 79-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
80 </intent-filter> 80 </intent-filter>
81 81
82 <meta-data 82 <meta-data
82-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 82-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54
83 android:name="android.app.searchable" 83 android:name="android.app.searchable"
83-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 83-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-54
84 android:resource="@xml/searchable" /> 84 android:resource="@xml/searchable" />
84-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 84-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:80:17-51
85 </activity> 85 </activity>
86 86
87 <provider 87 <provider
87-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 87-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43
88 android:name="net.micode.notes.data.NotesProvider" 88 android:name="net.micode.notes.data.NotesProvider"
88-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 88-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-63
89 android:authorities="micode_notes" 89 android:authorities="micode_notes"
89-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 89-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-47
90 android:multiprocess="true" /> 90 android:multiprocess="true" />
90-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 90-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:86:13-40
91 91
92 <receiver 92 <receiver
92-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 92-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20
93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" 93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
93-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 93-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-57
94 android:label="@string/app_widget2x2" > 94 android:label="@string/app_widget2x2" >
94-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 94-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-50
95 <intent-filter> 95 <intent-filter>
95-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 95-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
96 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> 96 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
96-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 96-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
96-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 96-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
97 <action android:name="android.appwidget.action.APPWIDGET_DELETED" /> 97 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
97-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 97-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
97-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 97-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
98 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" /> 98 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
98-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 98-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
98-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 98-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
99 </intent-filter> 99 </intent-filter>
100 100
101 <meta-data 101 <meta-data
101-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 101-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
102 android:name="android.appwidget.provider" 102 android:name="android.appwidget.provider"
102-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 102-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
103 android:resource="@xml/widget_2x_info" /> 103 android:resource="@xml/widget_2x_info" />
103-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 103-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
104 </receiver> 104 </receiver>
105 <receiver 105 <receiver
105-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 105-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20
106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" 106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
106-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 106-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-57
107 android:label="@string/app_widget4x4" > 107 android:label="@string/app_widget4x4" >
107-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 107-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:103:13-50
108 <intent-filter> 108 <intent-filter>
108-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 108-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
109 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> 109 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
109-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 109-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
109-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 109-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
110 <action android:name="android.appwidget.action.APPWIDGET_DELETED" /> 110 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
110-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 110-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
110-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 110-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
111 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" /> 111 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
111-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 111-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
111-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 111-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
112 </intent-filter> 112 </intent-filter>
113 113
114 <meta-data 114 <meta-data
114-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 114-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
115 android:name="android.appwidget.provider" 115 android:name="android.appwidget.provider"
115-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 115-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
116 android:resource="@xml/widget_4x_info" /> 116 android:resource="@xml/widget_4x_info" />
116-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 116-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
117 </receiver> 117 </receiver>
118 <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" > 118 <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
118-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 118-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20
118-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 118-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:116:19-55
119 <intent-filter> 119 <intent-filter>
119-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 119-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29
120 <action android:name="android.intent.action.BOOT_COMPLETED" /> 120 <action android:name="android.intent.action.BOOT_COMPLETED" />
120-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 120-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-79
120-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 120-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-76
121 </intent-filter> 121 </intent-filter>
122 </receiver> 122 </receiver>
123 <receiver 123 <receiver
123-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 123-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20
124 android:name="net.micode.notes.ui.AlarmReceiver" 124 android:name="net.micode.notes.ui.AlarmReceiver"
124-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 124-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-61
125 android:process=":remote" > 125 android:process=":remote" >
125-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 125-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:124:13-38
126 </receiver> 126 </receiver>
127 127
128 <activity 128 <activity
128-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 128-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20
129 android:name="net.micode.notes.ui.AlarmAlertActivity" 129 android:name="net.micode.notes.ui.AlarmAlertActivity"
129-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 129-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-50
130 android:label="@string/app_name" 130 android:label="@string/app_name"
130-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 130-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-45
131 android:launchMode="singleInstance" 131 android:launchMode="singleInstance"
131-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 131-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-48
132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > 132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
132-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 132-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:131:13-75
133 </activity> 133 </activity>
134 <activity 134 <activity
134-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 134-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20
135 android:name="net.micode.notes.ui.NotesPreferenceActivity" 135 android:name="net.micode.notes.ui.NotesPreferenceActivity"
135-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 135-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-71
136 android:label="@string/preferences_title" 136 android:label="@string/preferences_title"
136-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 136-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-54
137 android:launchMode="singleTop" 137 android:launchMode="singleTop"
137-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 137-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-43
138 android:theme="@android:style/Theme.Holo.Light" > 138 android:theme="@android:style/Theme.Holo.Light" >
138-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 138-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:138:13-60
139 </activity> 139 </activity>
140 140
141 <service 141 <service
141-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 141-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" 142 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
142-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 142-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
143 android:exported="false" > 143 android:exported="false" >
143-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 143-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
144 </service> 144 </service>
145 145
146 <meta-data 146 <meta-data
146-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 146-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
147 android:name="android.app.default_searchable" 147 android:name="android.app.default_searchable"
147-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 147-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
148 android:value=".ui.NoteEditActivity" /> 148 android:value=".ui.NoteEditActivity" />
148-->D:\programming\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 148-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
149 </application> 149 </application>
150 150
151</manifest> 151</manifest>

@ -4,14 +4,14 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [ "map": [
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": { "from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
}, },
"to": { "to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
@ -23,14 +23,14 @@
} }
}, },
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
"startOffsets": "712", "startOffsets": "730",
"endLines": "21", "endLines": "21",
"endColumns": "19", "endColumns": "19",
"endOffsets": "817" "endOffsets": "838"
}, },
"to": { "to": {
"startLines": "2", "startLines": "2",
@ -47,14 +47,14 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
"map": [ "map": [
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": { "from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
"endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
}, },
"to": { "to": {
"startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
@ -66,31 +66,14 @@
} }
}, },
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
"startOffsets": "764,816,869,922,712",
"endColumns": "51,52,52,51,51",
"endOffsets": "811,864,917,969,759"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
}
},
{
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
"from": { "from": {
"startLines": "19,26", "startLines": "19,26",
"startColumns": "4,4", "startColumns": "4,4",
"startOffsets": "739,1047", "startOffsets": "758,1073",
"endLines": "24,29", "endLines": "24,29",
"endColumns": "19,19", "endColumns": "19,19",
"endOffsets": "1041,1162" "endOffsets": "1065,1191"
}, },
"to": { "to": {
"startLines": "2,8", "startLines": "2,8",
@ -102,14 +85,14 @@
} }
}, },
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": { "from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45", "startLines": "50,55,64,60,22,26,30,35,40,18,45",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
"endLines": "53,58,67,62,25,29,33,38,43,21,48", "endLines": "53,58,67,62,25,29,33,38,43,21,48",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
}, },
"to": { "to": {
"startLines": "125,129,133,137,140,144,148,152,156,160,164", "startLines": "125,129,133,137,140,144,148,152,156,160,164",
@ -121,13 +104,13 @@
} }
}, },
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
"startOffsets": "712", "startOffsets": "730",
"endColumns": "56", "endColumns": "56",
"endOffsets": "764" "endOffsets": "782"
}, },
"to": { "to": {
"startLines": "12", "startLines": "12",
@ -136,6 +119,23 @@
"endColumns": "56", "endColumns": "56",
"endOffsets": "472" "endOffsets": "472"
} }
},
{
"source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
"startOffsets": "783,836,890,944,730",
"endColumns": "51,52,52,51,51",
"endOffsets": "830,884,938,991,777"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
}
} }
] ]
}, },
@ -143,14 +143,14 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [ "map": [
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
"startOffsets": "712", "startOffsets": "730",
"endLines": "21", "endLines": "21",
"endColumns": "19", "endColumns": "19",
"endOffsets": "817" "endOffsets": "838"
}, },
"to": { "to": {
"startLines": "2", "startLines": "2",
@ -162,14 +162,14 @@
} }
}, },
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": { "from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
"endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
}, },
"to": { "to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",

@ -4,14 +4,14 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
"map": [ "map": [
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": { "from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
}, },
"to": { "to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
@ -23,14 +23,14 @@
} }
}, },
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
"startOffsets": "712", "startOffsets": "730",
"endLines": "21", "endLines": "21",
"endColumns": "19", "endColumns": "19",
"endOffsets": "817" "endOffsets": "838"
}, },
"to": { "to": {
"startLines": "2", "startLines": "2",

@ -4,14 +4,14 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
"map": [ "map": [
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
"startOffsets": "712", "startOffsets": "730",
"endLines": "21", "endLines": "21",
"endColumns": "19", "endColumns": "19",
"endOffsets": "817" "endOffsets": "838"
}, },
"to": { "to": {
"startLines": "2", "startLines": "2",
@ -23,14 +23,14 @@
} }
}, },
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": { "from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
"endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
}, },
"to": { "to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",

@ -4,14 +4,14 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
"map": [ "map": [
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": { "from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
"endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
}, },
"to": { "to": {
"startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
@ -23,31 +23,14 @@
} }
}, },
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
"startOffsets": "764,816,869,922,712",
"endColumns": "51,52,52,51,51",
"endOffsets": "811,864,917,969,759"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
}
},
{
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
"from": { "from": {
"startLines": "19,26", "startLines": "19,26",
"startColumns": "4,4", "startColumns": "4,4",
"startOffsets": "739,1047", "startOffsets": "758,1073",
"endLines": "24,29", "endLines": "24,29",
"endColumns": "19,19", "endColumns": "19,19",
"endOffsets": "1041,1162" "endOffsets": "1065,1191"
}, },
"to": { "to": {
"startLines": "2,8", "startLines": "2,8",
@ -59,14 +42,14 @@
} }
}, },
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": { "from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45", "startLines": "50,55,64,60,22,26,30,35,40,18,45",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
"endLines": "53,58,67,62,25,29,33,38,43,21,48", "endLines": "53,58,67,62,25,29,33,38,43,21,48",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
}, },
"to": { "to": {
"startLines": "125,129,133,137,140,144,148,152,156,160,164", "startLines": "125,129,133,137,140,144,148,152,156,160,164",
@ -78,13 +61,13 @@
} }
}, },
{ {
"source": "D:\\programming\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
"startOffsets": "712", "startOffsets": "730",
"endColumns": "56", "endColumns": "56",
"endOffsets": "764" "endOffsets": "782"
}, },
"to": { "to": {
"startLines": "12", "startLines": "12",
@ -93,6 +76,23 @@
"endColumns": "56", "endColumns": "56",
"endOffsets": "472" "endOffsets": "472"
} }
},
{
"source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
"startOffsets": "783,836,890,944,730",
"endColumns": "51,52,52,51,51",
"endOffsets": "830,884,938,991,777"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
}
} }
] ]
} }

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save