1

11 months ago · f2921400c2
parent e803e6b604
commit f2921400c2
44 changed files with 336 additions and 1751 deletions
--- a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin
+++ b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin
--- a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock
+++ b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock
--- a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin
+++ b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin
--- a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin
+++ b/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin
--- a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
--- a/src/Notes-master/.gradle/file-system.probe
+++ b/src/Notes-master/.gradle/file-system.probe
--- a/src/Notes-master/.idea/sonarlint/issuestore/0/2/023468cfdd0b71d4098903b9070e364658e2fbcf
+++ b/src/Notes-master/.idea/sonarlint/issuestore/0/2/023468cfdd0b71d4098903b9070e364658e2fbcf
@ -1,6 +1,6 @@

 >
-java:S1604t"(Make this anonymous inner class a lambda(ÉãÃ®
+java:S1604s"(Make this anonymous inner class a lambda(ÉãÃ®
 V	java:S125"<This block of commented-out lines of code should be removed.(Í›<C38D>¸ýÿÿÿÿ
 €
 java:S3008""eRename this field "GTASK_SYNC_NOTIFICATION_ID" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ëíÅÍúÿÿÿÿ
@ -10,12 +10,9 @@ N
 java:S3878="8Remove this array creation and simply pass the elements.(‘ÀßŽ
 M
 java:S1874="7Remove this use of "publishProgress"; it is deprecated.(‘ÀßŽ
-C
-java:S1172B".Remove this unused method parameter "content".(ÖÔ¥R
 K
 java:S1874E"0Remove this use of "defaults"; it is deprecated.(±æÝÈûÿÿÿÿ
-V	java:S125Q"<This block of commented-out lines of code should be removed.(ëœôùþÿÿÿÿ
 e
-java:S1874^"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ã«•·ÿÿÿÿÿ
+java:S1874]"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ã«•·ÿÿÿÿÿ
 e
-java:S1874f"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(÷á‰½ûÿÿÿÿ
+java:S1874e"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(÷á‰½ûÿÿÿÿ
--- a/src/Notes-master/.idea/sonarlint/issuestore/c/1/c182d0c9c237ea8a46a92ccaae9bb5c751923a88
+++ b/src/Notes-master/.idea/sonarlint/issuestore/c/1/c182d0c9c237ea8a46a92ccaae9bb5c751923a88
@ -0,0 +1,3 @@
+
+b
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(ð«¦í8Õà¬çÎ1
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@ -1,105 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-#Thu Dec 21 01:11:46 CST 2023
-net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-6\:/drawable/new_note.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-6\:/layout/add_account_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-6\:/layout/datetime_picker.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-6\:/layout/folder_list_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-6\:/layout/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-6\:/layout/note_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-6\:/layout/note_list.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-6\:/layout/note_list_footer.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-6\:/layout/settings_header.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-6\:/layout/widget_2x.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-6\:/layout/widget_4x.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-6\:/menu/call_note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-6\:/menu/call_record_folder.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-6\:/menu/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-net.micode.notes.app-main-6\:/menu/note_list.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-6\:/menu/note_list_options.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-6\:/menu/sub_folder.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-6\:/raw/introduction=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-6\:/xml/preferences.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-6\:/xml/searchable.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-=======
-=======
->>>>>>> liuyitao-branch
-#Sun Dec 10 23:29:21 CST 2023
+#Tue Jan 09 14:31:37 CST 2024
 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
@ -195,7 +94,3 @@ net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\Project1\\MiNotes\\src\\N
 net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
 net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
 net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
--- a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@ -1,105 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-#Thu Dec 21 01:11:49 CST 2023
-net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
-net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
-net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
-net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
-net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
-net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
-net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
-net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
-net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
-net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
-net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
-net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
-net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
-net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
-net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
-net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
-net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
-net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
-net.micode.notes.app-main-5\:/drawable/new_note.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
-net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
-net.micode.notes.app-main-5\:/layout/add_account_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
-net.micode.notes.app-main-5\:/layout/datetime_picker.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
-net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
-net.micode.notes.app-main-5\:/layout/folder_list_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
-net.micode.notes.app-main-5\:/layout/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
-net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
-net.micode.notes.app-main-5\:/layout/note_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
-net.micode.notes.app-main-5\:/layout/note_list.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
-net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
-net.micode.notes.app-main-5\:/layout/note_list_footer.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
-net.micode.notes.app-main-5\:/layout/settings_header.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
-net.micode.notes.app-main-5\:/layout/widget_2x.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
-net.micode.notes.app-main-5\:/layout/widget_4x.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
-net.micode.notes.app-main-5\:/menu/call_note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
-net.micode.notes.app-main-5\:/menu/call_record_folder.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
-net.micode.notes.app-main-5\:/menu/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
-net.micode.notes.app-main-5\:/menu/note_list.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
-net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
-net.micode.notes.app-main-5\:/menu/note_list_options.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
-net.micode.notes.app-main-5\:/menu/sub_folder.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
-net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
-net.micode.notes.app-main-5\:/raw/introduction=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
-net.micode.notes.app-main-5\:/xml/preferences.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
-net.micode.notes.app-main-5\:/xml/searchable.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
-net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
-net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
-=======
-=======
->>>>>>> liuyitao-branch
-#Sun Dec 10 23:29:22 CST 2023
+#Tue Jan 09 14:31:38 CST 2024
 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
 net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
 net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
@ -195,7 +94,3 @@ net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\Project1\\MiNotes\\src\\N
 net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
 net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
 net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
--- a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
--- a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
@ -1,9 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-#Thu Dec 21 01:11:50 CST 2023
-=======
-#Wed Dec 20 23:43:26 CST 2023
->>>>>>> liuyitao-branch
-=======
-#Wed Dec 20 23:43:26 CST 2023
->>>>>>> liuyitao-branch
+#Tue Jan 09 14:37:56 CST 2024
--- a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
-=======
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
->>>>>>> liuyitao-branch
-=======
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
->>>>>>> liuyitao-branch
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>
-=======
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>
->>>>>>> liuyitao-branch
-=======
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>
->>>>>>> liuyitao-branch
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
-=======
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
->>>>>>> liuyitao-branch
-=======
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
->>>>>>> liuyitao-branch
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>
-=======
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>
->>>>>>> liuyitao-branch
-=======
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>
->>>>>>> liuyitao-branch
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@ -20,257 +20,6 @@
 20    android:versionName="0.1" >
 21
 22    <uses-sdk
-<<<<<<< HEAD
-<<<<<<< HEAD
-22-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-23        android:minSdkVersion="14"
-23-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
-24        android:targetSdkVersion="14" />
-25
-26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-26-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
-26-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
-27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
-27-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
-28    <uses-permission android:name="android.permission.INTERNET" />
-28-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
-28-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
-29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
-29-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
-30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
-30-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
-31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
-31-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
-32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
-32-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
-33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
-33-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
-34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
-34-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
-35
-36    <application
-36-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
-37        android:debuggable="true"
-38        android:extractNativeLibs="true"
-39        android:icon="@drawable/icon_app"
-39-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
-40        android:label="@string/app_name"
-40-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
-41        android:testOnly="true" >
-42        <activity
-42-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
-43            android:name="net.micode.notes.ui.NotesListActivity"
-43-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
-44            android:configChanges="keyboardHidden|orientation|screenSize"
-44-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
-45            android:label="@string/app_name"
-45-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
-46            android:launchMode="singleTop"
-46-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
-47            android:theme="@style/NoteTheme"
-47-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
-48            android:windowSoftInputMode="adjustPan" >
-48-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
-49            <intent-filter>
-49-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
-50                <action android:name="android.intent.action.MAIN" />
-50-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
-50-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
-51
-52                <category android:name="android.intent.category.LAUNCHER" />
-52-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
-52-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
-53            </intent-filter>
-54        </activity>
-55        <activity
-55-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20
-56            android:name="net.micode.notes.ui.NoteEditActivity"
-56-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48
-57            android:configChanges="keyboardHidden|orientation|screenSize"
-57-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
-58            android:launchMode="singleTop"
-58-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43
-59            android:theme="@style/NoteTheme" >
-59-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45
-60            <intent-filter>
-60-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29
-61                <action android:name="android.intent.action.VIEW" />
-61-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69
-61-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66
-62
-63                <category android:name="android.intent.category.DEFAULT" />
-63-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-63-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
-64
-65                <data android:mimeType="vnd.android.cursor.item/text_note" />
-65-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-65-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-66                <data android:mimeType="vnd.android.cursor.item/call_note" />
-66-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-66-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-67            </intent-filter>
-68            <intent-filter>
-68-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29
-69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-69-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79
-69-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76
-70
-71                <category android:name="android.intent.category.DEFAULT" />
-71-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-71-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
-72
-73                <data android:mimeType="vnd.android.cursor.item/text_note" />
-73-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-73-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-74                <data android:mimeType="vnd.android.cursor.item/call_note" />
-74-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-74-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-75            </intent-filter>
-76            <intent-filter>
-76-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29
-77                <action android:name="android.intent.action.SEARCH" />
-77-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71
-77-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68
-78
-79                <category android:name="android.intent.category.DEFAULT" />
-79-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-79-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
-80            </intent-filter>
-81
-82            <meta-data
-82-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54
-83                android:name="android.app.searchable"
-83-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54
-84                android:resource="@xml/searchable" />
-84-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51
-85        </activity>
-86
-87        <provider
-87-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43
-88            android:name="net.micode.notes.data.NotesProvider"
-88-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63
-89            android:authorities="micode_notes"
-89-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47
-90            android:multiprocess="true" />
-90-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40
-91
-92        <receiver
-92-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20
-93            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-93-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88:13-57
-94            android:label="@string/app_widget2x2" >
-94-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50
-95            <intent-filter>
-95-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
-96                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-96-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
-96-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
-97                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-97-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
-97-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
-98                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-98-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-98-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
-99            </intent-filter>
-100
-101            <meta-data
-101-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
-102                android:name="android.appwidget.provider"
-102-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
-103                android:resource="@xml/widget_2x_info" />
-103-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
-104        </receiver>
-105        <receiver
-105-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20
-106            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-106-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57
-107            android:label="@string/app_widget4x4" >
-107-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50
-108            <intent-filter>
-108-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
-109                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-109-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
-109-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
-110                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-110-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
-110-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
-111                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-111-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-111-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
-112            </intent-filter>
-113
-114            <meta-data
-114-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
-115                android:name="android.appwidget.provider"
-115-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
-116                android:resource="@xml/widget_4x_info" />
-116-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
-117        </receiver>
-118        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-118-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20
-118-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55
-119            <intent-filter>
-119-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29
-120                <action android:name="android.intent.action.BOOT_COMPLETED" />
-120-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79
-120-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76
-121            </intent-filter>
-122        </receiver>
-123        <receiver
-123-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20
-124            android:name="net.micode.notes.ui.AlarmReceiver"
-124-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61
-125            android:process=":remote" >
-125-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38
-126        </receiver>
-127
-128        <activity
-128-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20
-129            android:name="net.micode.notes.ui.AlarmAlertActivity"
-129-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50
-130            android:label="@string/app_name"
-130-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45
-131            android:launchMode="singleInstance"
-131-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48
-132            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-132-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75
-133        </activity>
-134        <activity
-134-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20
-135            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-135-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
-136            android:label="@string/preferences_title"
-136-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54
-137            android:launchMode="singleTop"
-137-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43
-138            android:theme="@android:style/Theme.Holo.Light" >
-138-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60
-139        </activity>
-140
-141        <service
-141-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
-142            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
-143            android:exported="false" >
-143-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
-144        </service>
-145
-146        <meta-data
-146-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
-147            android:name="android.app.default_searchable"
-147-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
-148            android:value=".ui.NoteEditActivity" />
-148-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
-=======
-=======
->>>>>>> liuyitao-branch
 22-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
 23        android:minSdkVersion="14"
 23-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
@ -310,217 +59,212 @@
 38        android:extractNativeLibs="true"
 39        android:icon="@drawable/icon_app"
 39-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
-40        android:label="@string/app_name"
+40        android:label="@string/app_name" >
 40-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
-41        android:testOnly="true" >
-42        <activity
-42-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
-43            android:name="net.micode.notes.ui.NotesListActivity"
-43-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
-44            android:configChanges="keyboardHidden|orientation|screenSize"
-44-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
-45            android:label="@string/app_name"
-45-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
-46            android:launchMode="singleTop"
-46-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
-47            android:theme="@style/NoteTheme"
-47-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
-48            android:windowSoftInputMode="adjustPan" >
-48-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
-49            <intent-filter>
-49-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
-50                <action android:name="android.intent.action.MAIN" />
-50-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
-50-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
-51
-52                <category android:name="android.intent.category.LAUNCHER" />
-52-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
-52-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
-53            </intent-filter>
-54        </activity>
-55        <activity
-55-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20
-56            android:name="net.micode.notes.ui.NoteEditActivity"
-56-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48
-57            android:configChanges="keyboardHidden|orientation|screenSize"
-57-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
-58            android:launchMode="singleTop"
-58-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43
-59            android:theme="@style/NoteTheme" >
-59-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45
-60            <intent-filter>
-60-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29
-61                <action android:name="android.intent.action.VIEW" />
-61-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69
-61-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66
-62
-63                <category android:name="android.intent.category.DEFAULT" />
-63-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-63-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
-64
-65                <data android:mimeType="vnd.android.cursor.item/text_note" />
+41        <activity
+41-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
+42            android:name="net.micode.notes.ui.NotesListActivity"
+42-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
+43            android:configChanges="keyboardHidden|orientation|screenSize"
+43-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
+44            android:label="@string/app_name"
+44-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
+45            android:launchMode="singleTop"
+45-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
+46            android:theme="@style/NoteTheme"
+46-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
+47            android:windowSoftInputMode="adjustPan" >
+47-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
+48            <intent-filter>
+48-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
+49                <action android:name="android.intent.action.MAIN" />
+49-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
+49-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
+50
+51                <category android:name="android.intent.category.LAUNCHER" />
+51-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
+51-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
+52            </intent-filter>
+53        </activity>
+54        <activity
+54-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20
+55            android:name="net.micode.notes.ui.NoteEditActivity"
+55-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48
+56            android:configChanges="keyboardHidden|orientation|screenSize"
+56-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
+57            android:launchMode="singleTop"
+57-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43
+58            android:theme="@style/NoteTheme" >
+58-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45
+59            <intent-filter>
+59-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29
+60                <action android:name="android.intent.action.VIEW" />
+60-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69
+60-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66
+61
+62                <category android:name="android.intent.category.DEFAULT" />
+62-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
+62-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
+63
+64                <data android:mimeType="vnd.android.cursor.item/text_note" />
+64-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
+64-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
+65                <data android:mimeType="vnd.android.cursor.item/call_note" />
 65-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
 65-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-66                <data android:mimeType="vnd.android.cursor.item/call_note" />
-66-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-66-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-67            </intent-filter>
-68            <intent-filter>
-68-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29
-69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-69-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79
-69-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76
-70
-71                <category android:name="android.intent.category.DEFAULT" />
-71-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-71-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
-72
-73                <data android:mimeType="vnd.android.cursor.item/text_note" />
+66            </intent-filter>
+67            <intent-filter>
+67-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29
+68                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+68-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79
+68-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76
+69
+70                <category android:name="android.intent.category.DEFAULT" />
+70-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
+70-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
+71
+72                <data android:mimeType="vnd.android.cursor.item/text_note" />
+72-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
+72-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
+73                <data android:mimeType="vnd.android.cursor.item/call_note" />
 73-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
 73-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-74                <data android:mimeType="vnd.android.cursor.item/call_note" />
-74-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-74-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
-75            </intent-filter>
-76            <intent-filter>
-76-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29
-77                <action android:name="android.intent.action.SEARCH" />
-77-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71
-77-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68
-78
-79                <category android:name="android.intent.category.DEFAULT" />
-79-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-79-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
-80            </intent-filter>
-81
-82            <meta-data
-82-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54
-83                android:name="android.app.searchable"
-83-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54
-84                android:resource="@xml/searchable" />
-84-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51
-85        </activity>
-86
-87        <provider
-87-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43
-88            android:name="net.micode.notes.data.NotesProvider"
-88-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63
-89            android:authorities="micode_notes"
-89-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47
-90            android:multiprocess="true" />
-90-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40
-91
-92        <receiver
-92-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20
-93            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-93-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88:13-57
-94            android:label="@string/app_widget2x2" >
-94-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50
-95            <intent-filter>
-95-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
-96                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
-96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
-97                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
-97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
-98                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-98-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-98-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
-99            </intent-filter>
-100
-101            <meta-data
-101-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
-102                android:name="android.appwidget.provider"
-102-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
-103                android:resource="@xml/widget_2x_info" />
-103-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
-104        </receiver>
-105        <receiver
-105-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20
-106            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-106-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57
-107            android:label="@string/app_widget4x4" >
-107-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50
-108            <intent-filter>
-108-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
-109                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
-109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
-110                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
-110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
-111                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-111-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-111-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
-112            </intent-filter>
-113
-114            <meta-data
-114-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
-115                android:name="android.appwidget.provider"
-115-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
-116                android:resource="@xml/widget_4x_info" />
-116-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
-117        </receiver>
-118        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-118-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20
-118-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55
-119            <intent-filter>
-119-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29
-120                <action android:name="android.intent.action.BOOT_COMPLETED" />
-120-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79
-120-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76
-121            </intent-filter>
-122        </receiver>
-123        <receiver
-123-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20
-124            android:name="net.micode.notes.ui.AlarmReceiver"
-124-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61
-125            android:process=":remote" >
-125-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38
-126        </receiver>
-127
-128        <activity
-128-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20
-129            android:name="net.micode.notes.ui.AlarmAlertActivity"
-129-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50
-130            android:label="@string/app_name"
-130-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45
-131            android:launchMode="singleInstance"
-131-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48
-132            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-132-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75
-133        </activity>
-134        <activity
-134-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20
-135            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-135-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
-136            android:label="@string/preferences_title"
-136-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54
-137            android:launchMode="singleTop"
-137-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43
-138            android:theme="@android:style/Theme.Holo.Light" >
-138-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60
-139        </activity>
-140
-141        <service
-141-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
-142            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
-143            android:exported="false" >
-143-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
-144        </service>
-145
-146        <meta-data
-146-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
-147            android:name="android.app.default_searchable"
-147-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
-148            android:value=".ui.NoteEditActivity" />
-148-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
-149    </application>
-150
-151</manifest>
+74            </intent-filter>
+75            <intent-filter>
+75-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29
+76                <action android:name="android.intent.action.SEARCH" />
+76-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71
+76-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68
+77
+78                <category android:name="android.intent.category.DEFAULT" />
+78-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
+78-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
+79            </intent-filter>
+80
+81            <meta-data
+81-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54
+82                android:name="android.app.searchable"
+82-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54
+83                android:resource="@xml/searchable" />
+83-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51
+84        </activity>
+85
+86        <provider
+86-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43
+87            android:name="net.micode.notes.data.NotesProvider"
+87-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63
+88            android:authorities="micode_notes"
+88-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47
+89            android:multiprocess="true" />
+89-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40
+90
+91        <receiver
+91-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20
+92            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+92-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88:13-57
+93            android:label="@string/app_widget2x2" >
+93-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50
+94            <intent-filter>
+94-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
+95                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+95-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
+95-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
+96                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
+96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
+97                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
+97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
+98            </intent-filter>
+99
+100            <meta-data
+100-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
+101                android:name="android.appwidget.provider"
+101-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
+102                android:resource="@xml/widget_2x_info" />
+102-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
+103        </receiver>
+104        <receiver
+104-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20
+105            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+105-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57
+106            android:label="@string/app_widget4x4" >
+106-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50
+107            <intent-filter>
+107-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
+108                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+108-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
+108-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
+109                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
+109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
+110                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
+110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
+111            </intent-filter>
+112
+113            <meta-data
+113-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
+114                android:name="android.appwidget.provider"
+114-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
+115                android:resource="@xml/widget_4x_info" />
+115-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
+116        </receiver>
+117        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+117-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20
+117-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55
+118            <intent-filter>
+118-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29
+119                <action android:name="android.intent.action.BOOT_COMPLETED" />
+119-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79
+119-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76
+120            </intent-filter>
+121        </receiver>
+122        <receiver
+122-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20
+123            android:name="net.micode.notes.ui.AlarmReceiver"
+123-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61
+124            android:process=":remote" >
+124-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38
+125        </receiver>
+126
+127        <activity
+127-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20
+128            android:name="net.micode.notes.ui.AlarmAlertActivity"
+128-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50
+129            android:label="@string/app_name"
+129-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45
+130            android:launchMode="singleInstance"
+130-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48
+131            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+131-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75
+132        </activity>
+133        <activity
+133-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20
+134            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+134-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
+135            android:label="@string/preferences_title"
+135-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54
+136            android:launchMode="singleTop"
+136-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43
+137            android:theme="@android:style/Theme.Holo.Light" >
+137-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60
+138        </activity>
+139
+140        <service
+140-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
+141            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+141-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
+142            android:exported="false" >
+142-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
+143        </service>
+144
+145        <meta-data
+145-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
+146            android:name="android.app.default_searchable"
+146-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
+147            android:value=".ui.NoteEditActivity" />
+147-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
+148    </application>
+149
+150</manifest>
--- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
+++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@ -3,67 +3,32 @@
 3    package="net.micode.notes.test" >
 4
 5    <uses-sdk
-<<<<<<< HEAD
-<<<<<<< HEAD
-5-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:5-74
+5-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:5:5-74
 6        android:minSdkVersion="14"
-6-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:15-41
+6-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:5:15-41
 7        android:targetSdkVersion="14" />
-7-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:42-71
+7-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:5:42-71
 8
 9    <instrumentation
-9-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:11:5-15:66
+9-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:11:5-15:66
 10        android:name="android.test.InstrumentationTestRunner"
-10-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:11:22-75
+10-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:11:22-75
 11        android:functionalTest="false"
-11-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:14:22-52
+11-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:14:22-52
 12        android:handleProfiling="false"
-12-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:13:22-53
+12-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:13:22-53
 13        android:label="Tests for net.micode.notes"
-13-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:15:22-64
+13-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:15:22-64
 14        android:targetPackage="net.micode.notes" />
-14-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:12:22-62
+14-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:12:22-62
 15
 16    <application
-16-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:7:5-9:19
+16-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:7:5-9:19
 17        android:debuggable="true"
 18        android:extractNativeLibs="true" >
 19        <uses-library android:name="android.test.runner" />
-19-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:8:9-60
-19-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:8:23-57
-=======
-=======
->>>>>>> liuyitao-branch
-5-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:5-74
-6        android:minSdkVersion="14"
-6-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:15-41
-7        android:targetSdkVersion="14" />
-7-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:42-71
-8
-9    <instrumentation
-9-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:11:5-15:66
-10        android:name="android.test.InstrumentationTestRunner"
-10-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:11:22-75
-11        android:functionalTest="false"
-11-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:14:22-52
-12        android:handleProfiling="false"
-12-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:13:22-53
-13        android:label="Tests for net.micode.notes"
-13-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:15:22-64
-14        android:targetPackage="net.micode.notes" />
-14-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:12:22-62
-15
-16    <application
-16-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:7:5-9:19
-17        android:debuggable="true"
-18        android:extractNativeLibs="true" >
-19        <uses-library android:name="android.test.runner" />
-19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:8:9-60
-19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:8:23-57
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
+19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:8:9-60
+19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:8:23-57
 20    </application>
 21
 22</manifest>
--- a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@ -37,8 +37,7 @@
        android:debuggable="true"
        android:extractNativeLibs="true"
        android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
-        android:testOnly="true" >
+        android:label="@string/app_name" >
        <activity
            android:name="net.micode.notes.ui.NotesListActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
--- a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@ -37,8 +37,7 @@
        android:debuggable="true"
        android:extractNativeLibs="true"
        android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
-        android:testOnly="true" >
+        android:label="@string/app_name" >
        <activity
            android:name="net.micode.notes.ui.NotesListActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@ -1,42 +1,7 @@
 {
    "logs": [
        {
-<<<<<<< HEAD
-<<<<<<< HEAD
            "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
-            "map": [
-                {
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "730",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "838"
-                    },
-                    "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "from": {
-                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
-=======
-=======
->>>>>>> liuyitao-branch
-            "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat",
            "map": [
                {
                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
@ -47,10 +12,6 @@
                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
                        "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
                    },
                    "to": {
                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
@ -60,11 +21,6 @@
                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
                    }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> liuyitao-branch
                },
                {
                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
@ -84,10 +40,6 @@
                        "endColumns": "19",
                        "endOffsets": "210"
                    }
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
                }
            ]
        },
@ -95,202 +47,6 @@
            "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
            "map": [
                {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "783,836,890,944,730",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "830,884,938,991,777"
-                    },
-                    "to": {
-                        "startLines": "13,14,15,16,17",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "730",
-                        "endColumns": "56",
-                        "endOffsets": "782"
-                    },
-                    "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\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",
-                        "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
-                        "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
-=======
-=======
->>>>>>> liuyitao-branch
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
-                    },
-                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
-                    }
-                },
-                {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\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"
-=======
-=======
->>>>>>> liuyitao-branch
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
-                    "from": {
-                        "startLines": "-1,-1",
-                        "startColumns": "-1,-1",
-                        "startOffsets": "-1,-1"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
-                    },
-                    "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "105,300",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "295,415"
-                    }
-                },
-                {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.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,2913,2696,1098,1287,1476,1685,1897,911,2104"
-=======
-=======
->>>>>>> liuyitao-branch
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
-                    "from": {
-                        "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
-                    },
-                    "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,8749,8909,9092,9277,9462,9665,9871,10054",
-                        "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,8744,8904,9087,9272,9457,9660,9866,10049,10250"
-                    }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> liuyitao-branch
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
-                    "from": {
-                        "startLines": "-1",
-                        "startColumns": "-1",
-                        "startOffsets": "-1"
-                    },
-                    "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
-                    }
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1"
-                    },
-                    "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"
-                    }
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
-                }
-            ]
-        },
-        {
-<<<<<<< HEAD
-<<<<<<< HEAD
-            "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
-            "map": [
-                {
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "730",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "838"
-=======
-=======
->>>>>>> liuyitao-branch
-            "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat",
-            "map": [
-                {
                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\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",
@ -336,15 +92,15 @@
                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
                        "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": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                        "endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056"
                    },
                    "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",
+                        "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
                        "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"
+                        "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
                    }
                },
                {
@ -384,7 +140,7 @@
            ]
        },
        {
-            "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat",
+            "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
            "map": [
                {
                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
@ -395,10 +151,6 @@
                        "endLines": "21",
                        "endColumns": "19",
                        "endOffsets": "817"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
                    },
                    "to": {
                        "startLines": "2",
@ -410,19 +162,6 @@
                    }
                },
                {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\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",
-                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
-                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
-=======
-=======
->>>>>>> liuyitao-branch
                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\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",
@ -431,10 +170,6 @@
                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
                        "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
                    },
                    "to": {
                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@ -4,38 +4,6 @@
            "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml",
            "map": [
                {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "730",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "838"
-                    },
-                    "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "from": {
-                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
-=======
-=======
->>>>>>> liuyitao-branch
                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\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",
@ -44,10 +12,6 @@
                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
                        "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
                    },
                    "to": {
                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
@ -57,11 +21,6 @@
                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
                    }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> liuyitao-branch
                },
                {
                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
@ -81,10 +40,6 @@
                        "endColumns": "19",
                        "endOffsets": "210"
                    }
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
                }
            ]
        }
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@ -4,19 +4,6 @@
            "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml",
            "map": [
                {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "730",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "838"
-=======
-=======
->>>>>>> liuyitao-branch
                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                    "from": {
                        "startLines": "18",
@ -25,10 +12,6 @@
                        "endLines": "21",
                        "endColumns": "19",
                        "endOffsets": "817"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
                    },
                    "to": {
                        "startLines": "2",
@ -40,19 +23,6 @@
                    }
                },
                {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\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",
-                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
-                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
-=======
-=======
->>>>>>> liuyitao-branch
                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\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",
@ -61,10 +31,6 @@
                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
                        "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
                    },
                    "to": {
                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@ -4,182 +4,6 @@
            "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
            "map": [
                {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "783,836,890,944,730",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "830,884,938,991,777"
-                    },
-                    "to": {
-                        "startLines": "13,14,15,16,17",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "730",
-                        "endColumns": "56",
-                        "endOffsets": "782"
-                    },
-                    "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\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",
-                        "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
-                        "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
-=======
-=======
->>>>>>> liuyitao-branch
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
-                    },
-                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
-                    }
-                },
-                {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\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"
-=======
-=======
->>>>>>> liuyitao-branch
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
-                    "from": {
-                        "startLines": "-1,-1",
-                        "startColumns": "-1,-1",
-                        "startOffsets": "-1,-1"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
-                    },
-                    "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "105,300",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "295,415"
-                    }
-                },
-                {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.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,2913,2696,1098,1287,1476,1685,1897,911,2104"
-=======
-=======
->>>>>>> liuyitao-branch
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
-                    "from": {
-                        "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1"
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
-                    },
-                    "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,8749,8909,9092,9277,9462,9665,9871,10054",
-                        "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,8744,8904,9087,9272,9457,9660,9866,10049,10250"
-                    }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> liuyitao-branch
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
-                    "from": {
-                        "startLines": "-1",
-                        "startColumns": "-1",
-                        "startOffsets": "-1"
-                    },
-                    "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
-                    }
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1"
-                    },
-                    "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"
-                    }
-                }
-            ]
-        },
-        {
-            "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-2:\\values\\values.xml",
-            "map": [
-                {
                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\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",
@ -225,15 +49,15 @@
                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
                        "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": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                        "endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056"
                    },
                    "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",
+                        "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
                        "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"
+                        "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
                    }
                },
                {
@ -269,10 +93,6 @@
                        "endColumns": "51,52,52,51,51",
                        "endOffsets": "524,577,630,682,734"
                    }
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
                }
            ]
        }
--- a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@ -37,8 +37,7 @@
        android:debuggable="true"
        android:extractNativeLibs="true"
        android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
-        android:testOnly="true" >
+        android:label="@string/app_name" >
        <activity
            android:name="net.micode.notes.ui.NotesListActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
--- a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
+++ b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
--- a/src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
+++ b/src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
@ -1 +1 @@
-{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
+{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
--- a/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
+++ b/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
@ -1,15 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-net.micode.notes.app-pngs-0 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\debug
-net.micode.notes.app-packageDebugResources-2 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
-net.micode.notes.app-packageDebugResources-3 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir
-net.micode.notes.app-merged_res-4 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-5 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\res
-net.micode.notes.app-main-6 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\res
-=======
-=======
->>>>>>> liuyitao-branch
 net.micode.notes.app-pngs-0 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\pngs\debug
 net.micode.notes.app-resValues-1 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\debug
 net.micode.notes.app-packageDebugResources-2 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
@ -17,7 +5,3 @@ net.micode.notes.app-packageDebugResources-3 D:\Project1\MiNotes\src\Notes-maste
 net.micode.notes.app-merged_res-4 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debug
 net.micode.notes.app-debug-5 D:\Project1\MiNotes\src\Notes-master\app\src\debug\res
 net.micode.notes.app-main-6 D:\Project1\MiNotes\src\Notes-master\app\src\main\res
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
--- a/src/Notes-master/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
+++ b/src/Notes-master/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
@ -1,17 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-net.micode.notes.test.app-androidTest-0 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug
-net.micode.notes.test.app-mergeDebugAndroidTestResources-1 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
-net.micode.notes.test.app-mergeDebugAndroidTestResources-2 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
-net.micode.notes.test.app-merged_res-3 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debugAndroidTest
-=======
-=======
->>>>>>> liuyitao-branch
 net.micode.notes.test.app-androidTest-0 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug
 net.micode.notes.test.app-mergeDebugAndroidTestResources-1 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
 net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
 net.micode.notes.test.app-merged_res-3 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debugAndroidTest
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
--- a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@ -1,109 +1,125 @@
-net.micode.notes:xml/searchable = 0x7f0c0001
 net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
-net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
-net.micode.notes:xml/widget_2x_info = 0x7f0c0002
-net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
-net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
-net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
-net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
-net.micode.notes:string/sync_progress_login = 0x7f0a005e
-net.micode.notes:string/success_sync_account = 0x7f0a005c
-net.micode.notes:string/search_setting_description = 0x7f0a0059
-net.micode.notes:string/search_hint = 0x7f0a0057
+net.micode.notes:string/menu_deselect_all = 0x7f0a0022
 net.micode.notes:string/search = 0x7f0a0056
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
+net.micode.notes:string/search_setting_description = 0x7f0a0059
+net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
 net.micode.notes:string/preferences_title = 0x7f0a0053
-net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
+net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
 net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
-net.micode.notes:string/preferences_add_account = 0x7f0a0046
-net.micode.notes:string/preferences_account_title = 0x7f0a0045
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
 net.micode.notes:xml/widget_4x_info = 0x7f0c0003
-net.micode.notes:string/set_remind_time_message = 0x7f0a005a
 net.micode.notes:string/notealert_enter = 0x7f0a0040
-net.micode.notes:string/note_link_web = 0x7f0a003f
-net.micode.notes:string/note_link_tel = 0x7f0a003e
+net.micode.notes:string/set_remind_time_message = 0x7f0a005a
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
+net.micode.notes:id/account_dialog_subtitle = 0x7f050000
+net.micode.notes:menu/note_list = 0x7f070003
+net.micode.notes:string/sync_progress_login = 0x7f0a005e
 net.micode.notes:string/note_link_other = 0x7f0a003d
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
-net.micode.notes:string/note_link_email = 0x7f0a003c
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
+net.micode.notes:string/search_hint = 0x7f0a0057
+net.micode.notes:string/menu_normal_mode = 0x7f0a002f
+net.micode.notes:string/menu_setting = 0x7f0a0036
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
+net.micode.notes:id/navigation_bar = 0x7f05002f
 net.micode.notes:string/note_alert_expired = 0x7f0a003b
-net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
-net.micode.notes:string/menu_sync = 0x7f0a0038
+net.micode.notes:id/ll_font_super = 0x7f05001f
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
 net.micode.notes:string/menu_share = 0x7f0a0037
-net.micode.notes:string/menu_setting = 0x7f0a0036
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
+net.micode.notes:string/error_sync_network = 0x7f0a0013
+net.micode.notes:id/notes_list = 0x7f050035
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
+net.micode.notes:string/menu_font_small = 0x7f0a002a
+net.micode.notes:string/menu_font_normal = 0x7f0a0028
+net.micode.notes:string/note_link_tel = 0x7f0a003e
 net.micode.notes:string/menu_select_title = 0x7f0a0034
-net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
-net.micode.notes:string/menu_select_all = 0x7f0a0032
+net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
+net.micode.notes:id/menu_send_to_desktop = 0x7f050029
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:id/preference_sync_button = 0x7f050037
 net.micode.notes:string/menu_search = 0x7f0a0031
-net.micode.notes:string/menu_normal_mode = 0x7f0a002f
 net.micode.notes:string/menu_font_size = 0x7f0a0029
-net.micode.notes:string/menu_font_small = 0x7f0a002a
-net.micode.notes:string/menu_font_normal = 0x7f0a0028
-net.micode.notes:string/menu_remove_remind = 0x7f0a0030
-net.micode.notes:string/menu_font_large = 0x7f0a0027
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
+net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
+net.micode.notes:string/menu_select_all = 0x7f0a0032
+net.micode.notes:string/note_link_email = 0x7f0a003c
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
+net.micode.notes:xml/searchable = 0x7f0c0001
 net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
+net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
 net.micode.notes:string/menu_export_text = 0x7f0a0023
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
+net.micode.notes:string/menu_remove_remind = 0x7f0a0030
+net.micode.notes:string/menu_font_large = 0x7f0a0027
+net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:layout/note_item = 0x7f060007
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
 net.micode.notes:string/menu_create_folder = 0x7f0a0020
-net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
+net.micode.notes:drawable/widget_2x_red = 0x7f04003a
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
+net.micode.notes:string/format_date_ymd = 0x7f0a0018
+net.micode.notes:string/preferences_account_summary = 0x7f0a0044
 net.micode.notes:string/success_sdcard_export = 0x7f0a005b
 net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
-net.micode.notes:string/preferences_account_summary = 0x7f0a0044
-net.micode.notes:string/format_date_ymd = 0x7f0a0018
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
 net.micode.notes:string/file_name_txt_format = 0x7f0a0015
-net.micode.notes:id/note_edit_list = 0x7f050031
 net.micode.notes:drawable/new_note = 0x7f04002f
 net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:string/menu_select_none = 0x7f0a0033
+net.micode.notes:id/note_edit_list = 0x7f050031
 net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:string/ticker_cancel = 0x7f0a0060
-net.micode.notes:drawable/list_red_single = 0x7f040023
-net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
+net.micode.notes:string/menu_select_none = 0x7f0a0033
+net.micode.notes:layout/widget_4x = 0x7f06000d
 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
-net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
+net.micode.notes:drawable/list_red_single = 0x7f040023
+net.micode.notes:string/ticker_cancel = 0x7f0a0060
 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
 net.micode.notes:drawable/widget_4x_green = 0x7f04003e
 net.micode.notes:string/error_sdcard_export = 0x7f0a000f
-net.micode.notes:string/notealert_ok = 0x7f0a0041
-net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
-net.micode.notes:id/tv_title = 0x7f05003f
+net.micode.notes:string/note_link_web = 0x7f0a003f
+net.micode.notes:id/menu_sync = 0x7f05002c
+net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
+net.micode.notes:xml/widget_2x_info = 0x7f0c0002
 net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
-net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
+net.micode.notes:id/tv_title = 0x7f05003f
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
+net.micode.notes:string/notealert_ok = 0x7f0a0041
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
 net.micode.notes:string/button_delete = 0x7f0a0007
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
+net.micode.notes:id/menu_list_mode = 0x7f050025
+net.micode.notes:string/app_widget2x2 = 0x7f0a0005
 net.micode.notes:string/ticker_fail = 0x7f0a0061
+net.micode.notes:string/app_name = 0x7f0a0004
 net.micode.notes:string/search_label = 0x7f0a0058
 net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
-net.micode.notes:string/app_widget2x2 = 0x7f0a0005
-net.micode.notes:string/app_name = 0x7f0a0004
-net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
-net.micode.notes:drawable/list_red_down = 0x7f040021
-net.micode.notes:id/menu_delete = 0x7f050021
-net.micode.notes:string/hint_foler_name = 0x7f0a001d
-net.micode.notes:string/widget_havenot_content = 0x7f0a0064
+net.micode.notes:string/success_sync_account = 0x7f0a005c
+net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
+net.micode.notes:id/amPm = 0x7f050003
+net.micode.notes:string/preferences_account_title = 0x7f0a0045
 net.micode.notes:string/alert_title_delete = 0x7f0a0003
+net.micode.notes:string/widget_havenot_content = 0x7f0a0064
+net.micode.notes:string/hint_foler_name = 0x7f0a001d
+net.micode.notes:id/menu_delete = 0x7f050021
+net.micode.notes:drawable/list_red_down = 0x7f040021
+net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
 net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
 net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
-net.micode.notes:layout/note_item = 0x7f060007
-net.micode.notes:menu/sub_folder = 0x7f070006
-net.micode.notes:menu/note_list = 0x7f070003
+net.micode.notes:string/preferences_add_account = 0x7f0a0046
+net.micode.notes:string/menu_sync = 0x7f0a0038
+net.micode.notes:id/move = 0x7f05002e
+net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
 net.micode.notes:string/ticker_syncing = 0x7f0a0063
-net.micode.notes:drawable/menu_move = 0x7f04002e
 net.micode.notes:id/menu_search = 0x7f050028
-net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
+net.micode.notes:drawable/menu_move = 0x7f04002e
 net.micode.notes:raw/introduction = 0x7f090000
 net.micode.notes:menu/call_record_folder = 0x7f070001
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
-net.micode.notes:menu/call_note_edit = 0x7f070000
 net.micode.notes:drawable/list_red_middle = 0x7f040022
 net.micode.notes:layout/widget_2x = 0x7f06000c
-net.micode.notes:layout/widget_4x = 0x7f06000d
 net.micode.notes:drawable/icon_app = 0x7f040015
 net.micode.notes:layout/note_list = 0x7f060008
 net.micode.notes:layout/note_edit = 0x7f060005
@ -112,8 +128,8 @@ net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
 net.micode.notes:drawable/widget_2x_blue = 0x7f040038
 net.micode.notes:layout/folder_list_item = 0x7f060004
 net.micode.notes:string/sync_progress_init_list = 0x7f0a005d
-net.micode.notes:id/btn_new_note = 0x7f050004
 net.micode.notes:layout/add_account_text = 0x7f060001
+net.micode.notes:id/btn_new_note = 0x7f050004
 net.micode.notes:id/widget_text = 0x7f050042
 net.micode.notes:id/widget_bg_image = 0x7f050041
 net.micode.notes:string/menu_folder_delete = 0x7f0a0025
@ -124,49 +140,38 @@ net.micode.notes:id/tv_alert_date = 0x7f05003a
 net.micode.notes:color/primary_text_dark = 0x7f020000
 net.micode.notes:id/tv_time = 0x7f05003e
 net.micode.notes:id/selection_menu = 0x7f050038
-net.micode.notes:id/preference_sync_button = 0x7f050037
-net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:id/notes_list = 0x7f050035
+net.micode.notes:id/ll_font_small = 0x7f05001e
 net.micode.notes:id/note_title = 0x7f050034
 net.micode.notes:string/format_exported_file_location = 0x7f0a001a
 net.micode.notes:id/note_bg_color_selector = 0x7f050030
-net.micode.notes:id/navigation_bar = 0x7f05002f
-net.micode.notes:id/move = 0x7f05002e
-net.micode.notes:id/menu_sync = 0x7f05002c
 net.micode.notes:id/menu_share = 0x7f05002b
 net.micode.notes:string/format_folder_files_count = 0x7f0a001b
+net.micode.notes:id/menu_setting = 0x7f05002a
 net.micode.notes:string/menu_move = 0x7f0a002d
 net.micode.notes:id/date = 0x7f050007
 net.micode.notes:id/note_item = 0x7f050033
-net.micode.notes:id/menu_setting = 0x7f05002a
-net.micode.notes:id/menu_send_to_desktop = 0x7f050029
-net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
 net.micode.notes:id/note_edit_view = 0x7f050032
-net.micode.notes:id/menu_list_mode = 0x7f050025
+net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
 net.micode.notes:id/menu_font_size = 0x7f050024
 net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048
 net.micode.notes:id/menu_alert = 0x7f050020
-net.micode.notes:dimen/text_font_size_large = 0x7f030000
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:id/ll_font_small = 0x7f05001e
 net.micode.notes:string/error_note_not_exist = 0x7f0a000e
 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
 net.micode.notes:id/minute = 0x7f05002d
 net.micode.notes:id/ll_font_normal = 0x7f05001d
 net.micode.notes:id/ll_font_large = 0x7f05001c
-net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
 net.micode.notes:id/iv_super_select = 0x7f05001b
-net.micode.notes:string/ticker_success = 0x7f0a0062
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+net.micode.notes:drawable/list_yellow_up = 0x7f04002c
+net.micode.notes:id/iv_bg_white = 0x7f050014
 net.micode.notes:id/iv_medium_select = 0x7f050019
+net.micode.notes:string/ticker_success = 0x7f0a0062
 net.micode.notes:id/iv_large_select = 0x7f050018
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
 net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
 net.micode.notes:id/iv_bg_yellow = 0x7f050016
-net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
-net.micode.notes:drawable/list_yellow_up = 0x7f04002c
-net.micode.notes:id/iv_bg_white = 0x7f050014
 net.micode.notes:menu/note_edit = 0x7f070002
 net.micode.notes:drawable/list_white_down = 0x7f040025
 net.micode.notes:drawable/list_white_up = 0x7f040028
@ -177,23 +182,18 @@ net.micode.notes:drawable/list_green_single = 0x7f04001f
 net.micode.notes:id/iv_alert_icon = 0x7f05000d
 net.micode.notes:drawable/list_yellow_single = 0x7f04002b
 net.micode.notes:id/cb_edit_item = 0x7f050006
+net.micode.notes:id/font_size_selector = 0x7f05000b
+net.micode.notes:color/user_query_highlight = 0x7f020002
 net.micode.notes:drawable/font_super = 0x7f040014
 net.micode.notes:drawable/edit_title_blue = 0x7f040009
-net.micode.notes:color/user_query_highlight = 0x7f020002
-net.micode.notes:id/font_size_selector = 0x7f05000b
-net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
 net.micode.notes:id/et_edit_text = 0x7f050009
-net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
-net.micode.notes:id/amPm = 0x7f050003
-net.micode.notes:id/account_dialog_subtitle = 0x7f050000
-net.micode.notes:id/menu_new_note = 0x7f050027
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
 net.micode.notes:id/iv_bg_green_select = 0x7f050011
-net.micode.notes:drawable/widget_2x_red = 0x7f04003a
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
+net.micode.notes:id/menu_new_note = 0x7f050027
 net.micode.notes:drawable/clock = 0x7f040003
+net.micode.notes:array/menu_share_ways = 0x7f010001
 net.micode.notes:drawable/font_small = 0x7f040013
 net.micode.notes:id/btn_set_bg_color = 0x7f050005
-net.micode.notes:array/menu_share_ways = 0x7f010001
 net.micode.notes:style/NoteTheme = 0x7f0b0003
 net.micode.notes:drawable/notification = 0x7f040033
 net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
--- a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
@ -1,233 +1,5 @@
 -- Merging decision tree log ---
 manifest
-<<<<<<< HEAD
-<<<<<<< HEAD
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-	package
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
-		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
-	android:versionName
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:21:5-30
-		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
-	xmlns:android
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:11-69
-	android:versionCode
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:20:5-28
-		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
-uses-sdk
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-	android:targetSdkVersion
-		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
-	android:minSdkVersion
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
-		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
-uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
-uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
-uses-permission#android.permission.INTERNET
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
-uses-permission#android.permission.READ_CONTACTS
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
-uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
-uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
-uses-permission#android.permission.GET_ACCOUNTS
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
-uses-permission#android.permission.USE_CREDENTIALS
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
-uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
-application
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
-INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
-	android:extractNativeLibs
-		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
-	android:label
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
-	android:icon
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
-activity#net.micode.notes.ui.NotesListActivity
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
-	android:label
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
-	android:launchMode
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
-	android:windowSoftInputMode
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
-	android:configChanges
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
-	android:theme
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
-intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
-action#android.intent.action.MAIN
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
-category#android.intent.category.LAUNCHER
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
-activity#net.micode.notes.ui.NoteEditActivity
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20
-	android:launchMode
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43
-	android:configChanges
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
-	android:theme
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53: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 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29
-action#android.intent.action.VIEW
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66
-category#android.intent.category.DEFAULT
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
-data
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-	android:mimeType
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61: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 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29
-action#android.intent.action.INSERT_OR_EDIT
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76
-intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29
-action#android.intent.action.SEARCH
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68
-meta-data#android.app.searchable
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54
-	android:resource
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54
-provider#net.micode.notes.data.NotesProvider
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43
-	android:authorities
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47
-	android:multiprocess
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63
-receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20
-	android:label
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88: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 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
-action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
-action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
-action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
-meta-data#android.appwidget.provider
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
-	android:resource
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
-receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20
-	android:label
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57
-receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55
-intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29
-action#android.intent.action.BOOT_COMPLETED
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76
-receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20
-	android:process
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61
-activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20
-	android:label
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45
-	android:launchMode
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48
-	android:theme
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50
-activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20
-	android:label
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54
-	android:launchMode
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43
-	android:theme
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
-service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
-	android:exported
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
-meta-data#android.app.default_searchable
-ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
-	android:value
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
-	android:name
-		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
-=======
-=======
->>>>>>> liuyitao-branch
 ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
 INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
 INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
@ -451,7 +223,3 @@ ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
 		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
 	android:name
 		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
-<<<<<<< HEAD
->>>>>>> liuyitao-branch
-=======
->>>>>>> liuyitao-branch
--- a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskClient.class.uniqueId2
+++ b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskClient.class.uniqueId2
--- a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId1
+++ b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId1
--- a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MetaData.class.uniqueId3
+++ b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MetaData.class.uniqueId3
--- a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper$TABLE.class.uniqueId0
+++ b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper$TABLE.class.uniqueId0
--- a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId3
+++ b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId3
--- a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId2
+++ b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId2
--- a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlData.class.uniqueId1
+++ b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlData.class.uniqueId1
--- a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Task.class.uniqueId0
+++ b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Task.class.uniqueId0
--- a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TaskList.class.uniqueId4
+++ b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TaskList.class.uniqueId4