红色感叹号

src/.idea/gradle.xml

@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

src/app/build/intermediates/dex_number_of_buckets_file/debug/out

@@ -1 +1 @@
-8
+3

src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

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

src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml

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

src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

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

src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml

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

src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Tue Aug 16 21:01:57 CST 2022
-base.0=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+#Fri Aug 19 11:20:32 GMT+08:00 2022
+base.0=D\:\\git_test\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex

src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

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

src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json

@@ -4,7 +4,7 @@
             "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
             "map": [
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "source": "D:\\git_test\\src\\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",
@@ -23,7 +23,7 @@
                     }
                 },
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -47,43 +47,26 @@
             "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
             "map": [
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\arrays.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "758,1073",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1065,1191"
-                    },
-                    "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "105,300",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "295,415"
-                    }
-                },
-                {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "783,836,890,944,730",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "830,884,938,991,777"
+                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "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"
+                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
                     }
                 },
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\colors.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -100,7 +83,26 @@
                     }
                 },
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\strings.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "19,26",
+                        "startColumns": "4,4",
+                        "startOffsets": "758,1073",
+                        "endLines": "24,29",
+                        "endColumns": "19,19",
+                        "endOffsets": "1065,1191"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values\\strings.xml",
                     "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",
                         "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",
@@ -119,22 +121,20 @@
                     }
                 },
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\styles.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
-                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
-                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
+                        "startLines": "19,20,21,22,18",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "783,836,890,944,730",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "830,884,938,991,777"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                        "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",
             "map": [
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -162,7 +162,7 @@
                     }
                 },
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "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",
                         "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",

src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json

@@ -4,7 +4,7 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
             "map": [
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "source": "D:\\git_test\\src\\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",
@@ -23,7 +23,7 @@
                     }
                 },
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",

src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json

@@ -4,7 +4,7 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
             "map": [
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -23,7 +23,7 @@
                     }
                 },
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "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",
                         "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",

src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json

@@ -4,43 +4,26 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
             "map": [
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\arrays.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "758,1073",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1065,1191"
-                    },
-                    "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "105,300",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "295,415"
-                    }
-                },
-                {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "783,836,890,944,730",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "830,884,938,991,777"
+                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "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"
+                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
                     }
                 },
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\colors.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -57,7 +40,26 @@
                     }
                 },
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\strings.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "19,26",
+                        "startColumns": "4,4",
+                        "startOffsets": "758,1073",
+                        "endLines": "24,29",
+                        "endColumns": "19,19",
+                        "endOffsets": "1065,1191"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values\\strings.xml",
                     "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",
                         "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",
@@ -76,22 +78,20 @@
                     }
                 },
                 {
-                    "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\styles.xml",
+                    "source": "D:\\git_test\\src\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
-                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
-                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
+                        "startLines": "19,20,21,22,18",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "783,836,890,944,730",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "830,884,938,991,777"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                        "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"
                     }
                 }
             ]

src/app/build/intermediates/source_set_path_map/debug/file-map.txt

@@ -1,8 +1,8 @@
-net.micode.notes.app-pngs-0 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\generated\res\resValues\debug
-net.micode.notes.app-rs-2 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\generated\res\rs\debug
-net.micode.notes.app-mergeDebugResources-3 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
-net.micode.notes.app-mergeDebugResources-4 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
-net.micode.notes.app-merged_res-5 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-6 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\debug\res
-net.micode.notes.app-main-7 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\res
+net.micode.notes.app-pngs-0 D:\git_test\src\app\build\generated\res\pngs\debug
+net.micode.notes.app-resValues-1 D:\git_test\src\app\build\generated\res\resValues\debug
+net.micode.notes.app-rs-2 D:\git_test\src\app\build\generated\res\rs\debug
+net.micode.notes.app-mergeDebugResources-3 D:\git_test\src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
+net.micode.notes.app-mergeDebugResources-4 D:\git_test\src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
+net.micode.notes.app-merged_res-5 D:\git_test\src\app\build\intermediates\merged_res\debug
+net.micode.notes.app-debug-6 D:\git_test\src\app\src\debug\res
+net.micode.notes.app-main-7 D:\git_test\src\app\src\main\res

src/app/build/outputs/logs/manifest-merger-debug-report.txt

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

src/local.properties

@@ -2,6 +2,7 @@
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
-#
-#Tue Aug 16 14:45:46 CST 2022
-sdk.dir=C\:\\Users\\41485\\AppData\\Local\\Android\\Sdk
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu Aug 18 16:22:52 GMT+08:00 2022
+sdk.dir=C\:\\Users\\22479\\AppData\\Local\\Android\\Sdk