Wumengyang_branch
向金成 3 years ago
parent 471befb3c0
commit 77365f15c8

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>

@ -1,96 +1,96 @@
#Mon Mar 20 17:10:18 ULAT 2023 #Sat Mar 25 15:59:32 ULAT 2023
net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
net.micode.notes.app-main-7\:/menu/sub_folder.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat net.micode.notes.app-main-7\:/menu/sub_folder.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
net.micode.notes.app-main-7\:/layout/widget_4x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat net.micode.notes.app-main-7\:/layout/widget_4x.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
net.micode.notes.app-main-7\:/layout/note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat net.micode.notes.app-main-7\:/layout/note_edit.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\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_white_single.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
net.micode.notes.app-main-7\:/layout/widget_2x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat net.micode.notes.app-main-7\:/layout/widget_2x.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
net.micode.notes.app-main-7\:/layout/add_account_text.xml=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\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/selected.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\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_green_middle.9.png=E\:\\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=E\:\\gitProject1\\src\\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_white_down.9.png=E\:\\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=E\:\\gitProject1\\src\\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_blue_single.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\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_red_middle.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
net.micode.notes.app-main-7\:/layout/settings_header.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat net.micode.notes.app-main-7\:/layout/settings_header.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
net.micode.notes.app-main-7\:/menu/call_note_edit.xml=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
net.micode.notes.app-main-7\:/drawable/new_note.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat net.micode.notes.app-main-7\:/drawable/new_note.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
net.micode.notes.app-main-7\:/layout/note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat net.micode.notes.app-main-7\:/layout/note_list.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
net.micode.notes.app-main-7\:/color/primary_text_dark.xml=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-7\:/layout/datetime_picker.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat net.micode.notes.app-main-7\:/layout/datetime_picker.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
net.micode.notes.app-main-7\:/raw/introduction=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat net.micode.notes.app-main-7\:/raw/introduction=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\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_red.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
net.micode.notes.app-main-7\:/layout/note_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat net.micode.notes.app-main-7\:/layout/note_item.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
net.micode.notes.app-main-7\:/layout/note_list_footer.xml=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
net.micode.notes.app-main-7\:/xml/searchable.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat net.micode.notes.app-main-7\:/xml/searchable.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\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/list_white_middle.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\gitProject1\\src\\Notes-master1\\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="E:\Notes-master1\app\src\main\assets"/><source path="E:\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="E:\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="E:\gitProject1\src\Notes-master1\app\src\main\assets"/><source path="E:\gitProject1\src\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="E:\gitProject1\src\Notes-master1\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="E:\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="E:\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="E:\gitProject1\src\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="E:\gitProject1\src\Notes-master1\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="E:\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="E:\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="E:\gitProject1\src\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="E:\gitProject1\src\Notes-master1\app\src\debug\shaders"/></dataSet></merger>

@ -1,4 +1,4 @@
#Mon Mar 20 18:55:43 ULAT 2023 #Sat Mar 25 15:59:43 ULAT 2023
base.0=E\:\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex base.0=E\:\\gitProject1\\src\\Notes-master1\\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,254 +20,254 @@
20 android:versionName="0.1" > 20 android:versionName="0.1" >
21 21
22 <uses-sdk 22 <uses-sdk
22-->E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 22-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
23 android:minSdkVersion="14" 23 android:minSdkVersion="14"
23-->E:\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 23-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
24 android:targetSdkVersion="14" /> 24 android:targetSdkVersion="14" />
24-->E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 24-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 26-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
26-->E:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 26-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 27-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
27-->E:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 27-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 28-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
28-->E:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 28-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 29-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
29-->E:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 29-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 30-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
30-->E:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 30-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 31-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
31-->E:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 31-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 32-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
32-->E:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 32-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 33-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
33-->E:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 33-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 34-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
34-->E:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 34-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
35 35
36 <application 36 <application
36-->E:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 36-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 38-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
39 android:label="@string/app_name" 39 android:label="@string/app_name"
39-->E:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 39-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
40 android:testOnly="true" > 40 android:testOnly="true" >
41 <activity 41 <activity
41-->E:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 41-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 42-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
43 android:configChanges="keyboardHidden|orientation|screenSize" 43 android:configChanges="keyboardHidden|orientation|screenSize"
43-->E:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 43-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
44 android:label="@string/app_name" 44 android:label="@string/app_name"
44-->E:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 44-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
45 android:launchMode="singleTop" 45 android:launchMode="singleTop"
45-->E:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 45-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
46 android:theme="@style/NoteTheme" 46 android:theme="@style/NoteTheme"
46-->E:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 46-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
47 android:uiOptions="splitActionBarWhenNarrow" 47 android:uiOptions="splitActionBarWhenNarrow"
47-->E:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 47-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
48 android:windowSoftInputMode="adjustPan" > 48 android:windowSoftInputMode="adjustPan" >
48-->E:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 48-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
49 <intent-filter> 49 <intent-filter>
49-->E:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 49-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 50-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
50-->E:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 50-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 52-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
52-->E:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 52-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
53 </intent-filter> 53 </intent-filter>
54 </activity> 54 </activity>
55 <activity 55 <activity
55-->E:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 55-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 56-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
57 android:configChanges="keyboardHidden|orientation|screenSize" 57 android:configChanges="keyboardHidden|orientation|screenSize"
57-->E:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 57-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
58 android:launchMode="singleTop" 58 android:launchMode="singleTop"
58-->E:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 58-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
59 android:theme="@style/NoteTheme" > 59 android:theme="@style/NoteTheme" >
59-->E:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 59-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
60 <intent-filter> 60 <intent-filter>
60-->E:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 60-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
61 <action android:name="android.intent.action.VIEW" /> 61 <action android:name="android.intent.action.VIEW" />
61-->E:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 61-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
61-->E:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 61-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 63-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
63-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 63-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 65-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
65-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 65-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 66-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
66-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 66-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
67 </intent-filter> 67 </intent-filter>
68 <intent-filter> 68 <intent-filter>
68-->E:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 68-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 69-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
69-->E:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 69-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 71-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
71-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 71-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 73-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
73-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 73-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 74-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
74-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 74-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
75 </intent-filter> 75 </intent-filter>
76 <intent-filter> 76 <intent-filter>
76-->E:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 76-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 77-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
77-->E:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 77-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 79-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
79-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 79-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
80 </intent-filter> 80 </intent-filter>
81 81
82 <meta-data 82 <meta-data
82-->E:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 82-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
83 android:name="android.app.searchable" 83 android:name="android.app.searchable"
83-->E:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 83-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
84 android:resource="@xml/searchable" /> 84 android:resource="@xml/searchable" />
84-->E:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 84-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
85 </activity> 85 </activity>
86 86
87 <provider 87 <provider
87-->E:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 87-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 88-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
89 android:authorities="micode_notes" 89 android:authorities="micode_notes"
89-->E:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 89-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
90 android:multiprocess="true" /> 90 android:multiprocess="true" />
90-->E:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 90-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
91 91
92 <receiver 92 <receiver
92-->E:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 92-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 93-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
94 android:label="@string/app_widget2x2" > 94 android:label="@string/app_widget2x2" >
94-->E:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 94-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
95 <intent-filter> 95 <intent-filter>
95-->E:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 95-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 96-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
96-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 96-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 97-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
97-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 97-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 98-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
98-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 98-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
99 </intent-filter> 99 </intent-filter>
100 100
101 <meta-data 101 <meta-data
101-->E:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 101-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
102 android:name="android.appwidget.provider" 102 android:name="android.appwidget.provider"
102-->E:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 102-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
103 android:resource="@xml/widget_2x_info" /> 103 android:resource="@xml/widget_2x_info" />
103-->E:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 103-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
104 </receiver> 104 </receiver>
105 <receiver 105 <receiver
105-->E:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 105-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 106-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
107 android:label="@string/app_widget4x4" > 107 android:label="@string/app_widget4x4" >
107-->E:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 107-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
108 <intent-filter> 108 <intent-filter>
108-->E:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 108-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 109-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
109-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 109-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 110-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
110-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 110-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 111-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
111-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 111-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
112 </intent-filter> 112 </intent-filter>
113 113
114 <meta-data 114 <meta-data
114-->E:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 114-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
115 android:name="android.appwidget.provider" 115 android:name="android.appwidget.provider"
115-->E:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 115-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
116 android:resource="@xml/widget_4x_info" /> 116 android:resource="@xml/widget_4x_info" />
116-->E:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 116-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 118-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
118-->E:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 118-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
119 <intent-filter> 119 <intent-filter>
119-->E:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 119-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 120-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
120-->E:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 120-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
121 </intent-filter> 121 </intent-filter>
122 </receiver> 122 </receiver>
123 <receiver 123 <receiver
123-->E:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 123-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 124-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
125 android:process=":remote" > 125 android:process=":remote" >
125-->E:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 125-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
126 </receiver> 126 </receiver>
127 127
128 <activity 128 <activity
128-->E:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 128-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 129-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
130 android:label="@string/app_name" 130 android:label="@string/app_name"
130-->E:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 130-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
131 android:launchMode="singleInstance" 131 android:launchMode="singleInstance"
131-->E:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 131-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 132-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
133 </activity> 133 </activity>
134 <activity 134 <activity
134-->E:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 134-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 135-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
136 android:label="@string/preferences_title" 136 android:label="@string/preferences_title"
136-->E:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 136-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
137 android:launchMode="singleTop" 137 android:launchMode="singleTop"
137-->E:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 137-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 138-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
139 </activity> 139 </activity>
140 140
141 <service 141 <service
141-->E:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 141-->E:\gitProject1\src\Notes-master1\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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 142-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
143 android:exported="false" > 143 android:exported="false" >
143-->E:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 143-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
144 </service> 144 </service>
145 145
146 <meta-data 146 <meta-data
146-->E:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 146-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
147 android:name="android.app.default_searchable" 147 android:name="android.app.default_searchable"
147-->E:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 147-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58
148 android:value=".ui.NoteEditActivity" /> 148 android:value=".ui.NoteEditActivity" />
148-->E:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 148-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
149 </application> 149 </application>
150 150
151</manifest> 151</manifest>

@ -4,26 +4,7 @@
"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": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"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",
"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",
"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",
"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"
},
"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",
"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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
"endLines": "8,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",
"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": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
}
},
{
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
@ -40,6 +21,25 @@
"endColumns": "19", "endColumns": "19",
"endOffsets": "210" "endOffsets": "210"
} }
},
{
"source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"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",
"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",
"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",
"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"
},
"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",
"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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
"endLines": "8,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",
"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": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
}
} }
] ]
}, },
@ -47,43 +47,26 @@
"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": "E:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.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": "19,26",
"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",
"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": "739,1047",
"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": "24,29",
"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": "19,19",
"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": "1041,1162"
},
"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",
"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": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
"endLines": "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,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
"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": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
}
},
{
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.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": { "to": {
"startLines": "13,14,15,16,17", "startLines": "2,8",
"startColumns": "4,4,4,4,4", "startColumns": "4,4",
"startOffsets": "477,529,582,635,687", "startOffsets": "105,300",
"endColumns": "51,52,52,51,51", "endLines": "7,11",
"endOffsets": "524,577,630,682,734" "endColumns": "19,19",
"endOffsets": "295,415"
} }
}, },
{ {
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
@ -100,7 +83,7 @@
} }
}, },
{ {
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\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",
@ -119,22 +102,39 @@
} }
}, },
{ {
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
"from": { "from": {
"startLines": "19,26", "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", "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": "739,1047", "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",
"endLines": "24,29", "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": "19,19", "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": "1041,1162" "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"
}, },
"to": { "to": {
"startLines": "2,8", "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",
"startColumns": "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": "105,300", "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
"endLines": "7,11", "endLines": "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,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
"endColumns": "19,19", "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": "295,415" "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
}
},
{
"source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.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"
} }
} }
] ]
@ -143,7 +143,7 @@
"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": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\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",
@ -162,7 +162,7 @@
} }
}, },
{ {
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",

@ -4,26 +4,7 @@
"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": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"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",
"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",
"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",
"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"
},
"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",
"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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
"endLines": "8,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",
"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": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
}
},
{
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
@ -40,6 +21,25 @@
"endColumns": "19", "endColumns": "19",
"endOffsets": "210" "endOffsets": "210"
} }
},
{
"source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"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",
"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",
"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",
"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"
},
"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",
"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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
"endLines": "8,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",
"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": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
}
} }
] ]
} }

@ -4,7 +4,7 @@
"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": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\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",
@ -23,7 +23,7 @@
} }
}, },
{ {
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",

@ -4,43 +4,26 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
"map": [ "map": [
{ {
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.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": "19,26",
"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",
"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": "739,1047",
"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": "24,29",
"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": "19,19",
"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": "1041,1162"
},
"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",
"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": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
"endLines": "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,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
"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": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
}
},
{
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.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": { "to": {
"startLines": "13,14,15,16,17", "startLines": "2,8",
"startColumns": "4,4,4,4,4", "startColumns": "4,4",
"startOffsets": "477,529,582,635,687", "startOffsets": "105,300",
"endColumns": "51,52,52,51,51", "endLines": "7,11",
"endOffsets": "524,577,630,682,734" "endColumns": "19,19",
"endOffsets": "295,415"
} }
}, },
{ {
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
@ -57,7 +40,7 @@
} }
}, },
{ {
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\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",
@ -76,22 +59,39 @@
} }
}, },
{ {
"source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
"from": { "from": {
"startLines": "19,26", "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", "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": "739,1047", "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",
"endLines": "24,29", "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": "19,19", "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": "1041,1162" "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"
}, },
"to": { "to": {
"startLines": "2,8", "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",
"startColumns": "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": "105,300", "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
"endLines": "7,11", "endLines": "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,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
"endColumns": "19,19", "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": "295,415" "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
}
},
{
"source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.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"
} }
} }
] ]

@ -1,8 +1,8 @@
net.micode.notes.app-pngs-0 E:\Notes-master1\app\build\generated\res\pngs\debug net.micode.notes.app-pngs-0 E:\gitProject1\src\Notes-master1\app\build\generated\res\pngs\debug
net.micode.notes.app-resValues-1 E:\Notes-master1\app\build\generated\res\resValues\debug net.micode.notes.app-resValues-1 E:\gitProject1\src\Notes-master1\app\build\generated\res\resValues\debug
net.micode.notes.app-rs-2 E:\Notes-master1\app\build\generated\res\rs\debug net.micode.notes.app-rs-2 E:\gitProject1\src\Notes-master1\app\build\generated\res\rs\debug
net.micode.notes.app-mergeDebugResources-3 E:\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir net.micode.notes.app-mergeDebugResources-3 E:\gitProject1\src\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
net.micode.notes.app-mergeDebugResources-4 E:\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir net.micode.notes.app-mergeDebugResources-4 E:\gitProject1\src\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
net.micode.notes.app-merged_res-5 E:\Notes-master1\app\build\intermediates\merged_res\debug net.micode.notes.app-merged_res-5 E:\gitProject1\src\Notes-master1\app\build\intermediates\merged_res\debug
net.micode.notes.app-debug-6 E:\Notes-master1\app\src\debug\res net.micode.notes.app-debug-6 E:\gitProject1\src\Notes-master1\app\src\debug\res
net.micode.notes.app-main-7 E:\Notes-master1\app\src\main\res net.micode.notes.app-main-7 E:\gitProject1\src\Notes-master1\app\src\main\res

@ -1,235 +1,235 @@
-- Merging decision tree log --- -- Merging decision tree log ---
manifest manifest
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
package package
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml
android:versionName android:versionName
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml
xmlns:android xmlns:android
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69
android:versionCode android:versionCode
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml
uses-sdk uses-sdk
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
android:targetSdkVersion android:targetSdkVersion
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml
android:minSdkVersion android:minSdkVersion
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml
INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml INJECTED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
uses-permission#android.permission.INTERNET uses-permission#android.permission.INTERNET
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
uses-permission#android.permission.READ_CONTACTS uses-permission#android.permission.READ_CONTACTS
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
uses-permission#android.permission.MANAGE_ACCOUNTS uses-permission#android.permission.MANAGE_ACCOUNTS
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
uses-permission#android.permission.AUTHENTICATE_ACCOUNTS uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
uses-permission#android.permission.GET_ACCOUNTS uses-permission#android.permission.GET_ACCOUNTS
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
uses-permission#android.permission.USE_CREDENTIALS uses-permission#android.permission.USE_CREDENTIALS
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
uses-permission#android.permission.RECEIVE_BOOT_COMPLETED uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
application application
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
android:label android:label
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
android:icon android:icon
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
activity#net.micode.notes.ui.NotesListActivity activity#net.micode.notes.ui.NotesListActivity
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20
android:label android:label
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
android:launchMode android:launchMode
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
android:windowSoftInputMode android:windowSoftInputMode
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
android:uiOptions android:uiOptions
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
android:configChanges android:configChanges
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
android:theme android:theme
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29
action#android.intent.action.MAIN action#android.intent.action.MAIN
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66
category#android.intent.category.LAUNCHER category#android.intent.category.LAUNCHER
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
activity#net.micode.notes.ui.NoteEditActivity activity#net.micode.notes.ui.NoteEditActivity
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20
android:launchMode android:launchMode
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
android:configChanges android:configChanges
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
android:theme android:theme
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
action#android.intent.action.VIEW action#android.intent.action.VIEW
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
category#android.intent.category.DEFAULT category#android.intent.category.DEFAULT
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
data data
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
android:mimeType android:mimeType
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29
action#android.intent.action.INSERT_OR_EDIT action#android.intent.action.INSERT_OR_EDIT
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29
action#android.intent.action.SEARCH action#android.intent.action.SEARCH
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68
meta-data#android.app.searchable meta-data#android.app.searchable
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
android:resource android:resource
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
provider#net.micode.notes.data.NotesProvider provider#net.micode.notes.data.NotesProvider
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43
android:authorities android:authorities
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
android:multiprocess android:multiprocess
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x receiver#net.micode.notes.widget.NoteWidgetProvider_2x
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20
android:label android:label
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
action#android.appwidget.action.APPWIDGET_UPDATE action#android.appwidget.action.APPWIDGET_UPDATE
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
action#android.appwidget.action.APPWIDGET_DELETED action#android.appwidget.action.APPWIDGET_DELETED
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
action#android.intent.action.PRIVACY_MODE_CHANGED action#android.intent.action.PRIVACY_MODE_CHANGED
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
meta-data#android.appwidget.provider meta-data#android.appwidget.provider
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
android:resource android:resource
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x receiver#net.micode.notes.widget.NoteWidgetProvider_4x
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20
android:label android:label
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver receiver#net.micode.notes.ui.AlarmInitReceiver
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED intent-filter#action:name:android.intent.action.BOOT_COMPLETED
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29
action#android.intent.action.BOOT_COMPLETED action#android.intent.action.BOOT_COMPLETED
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
receiver#net.micode.notes.ui.AlarmReceiver receiver#net.micode.notes.ui.AlarmReceiver
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20
android:process android:process
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
activity#net.micode.notes.ui.AlarmAlertActivity activity#net.micode.notes.ui.AlarmAlertActivity
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
android:label android:label
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
android:launchMode android:launchMode
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48
android:theme android:theme
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity activity#net.micode.notes.ui.NotesPreferenceActivity
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20
android:label android:label
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
android:launchMode android:launchMode
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43
android:theme android:theme
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService service#net.micode.notes.gtask.remote.GTaskSyncService
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19
android:exported android:exported
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
meta-data#android.app.default_searchable meta-data#android.app.default_searchable
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
android:value android:value
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
android:name android:name
ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 ADDED from E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58

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

Loading…
Cancel
Save