Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 王志成_branch

# Conflicts:
#	src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin
#	src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock
#	src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin
#	src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock
#	src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin
#	src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin
#	src/Notes-master3/.gradle/file-system.probe
#	src/Notes-master3/.idea/deploymentTargetDropDown.xml
#	src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk
#	src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
#	src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
#	src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
#	src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
#	src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk
#	src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
#	src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
#	src/Notes-master3/local.properties

doc/实践一/第一次实践分工.txt

@@ -6,7 +6,6 @@
 谢成扬   data（74+280+363+306=1023）model(254+369=623)
 王俊龙: gtask （82+101+189+505+351+343+33+34+133+585+800+128=3284）
 胡逸飞：tool（342+296+114+182=934），widget(133+47+47=227)
-王俊龙: gtask
 王志成:ui （159+66+31+486+90+62+81+874+218+225+955+184+123+389=3943）
 
 、

doc/实践二/实践二精读范围.txt

@@ -0,0 +1,2 @@
+谢成扬   data（74+280+363+306=1023）model(254+369=623)+gtask（800）
+胡逸飞  tool包（342+296+114+182=934）+weight包(133+47+47=227)+ui包的（NotesListActivity~NotesPreferenceActivity）（955+184+123+389=1651）

src/Notes-master3/.idea/deploymentTargetDropDown.xml

@@ -12,6 +12,10 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
+<<<<<<< HEAD
     <timeTargetWasSelectedWithDropDown value="2023-03-28T10:51:38.430158700Z" />
+=======
+    <timeTargetWasSelectedWithDropDown value="2023-04-07T09:01:01.813209800Z" />
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
   </component>
 </project>

src/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt

@@ -1,2 +1,2 @@
 #- File Locator -
-listingFile=../../apk/debug/output-metadata.json
+listingFile=../../../outputs/apk/debug/output-metadata.json

src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out

@@ -1 +1 @@
-8
+4

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

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

src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -1,2 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\assets"/><source path="D:\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\assets"/></dataSet></merger>
+<<<<<<< HEAD
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\assets"/><source path="D:\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\assets"/></dataSet></merger>
+=======
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\assets"/><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\assets"/></dataSet></merger>
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780

src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
+<<<<<<< HEAD
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
+=======
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780

src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
+<<<<<<< HEAD
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
+=======
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780

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

@@ -1,4 +1,9 @@
+<<<<<<< HEAD
 #Fri Apr 14 16:16:28 CST 2023
 base.0=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+=======
+#Fri Apr 14 16:08:57 CST 2023
+base.0=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
 renamed.0=classes.dex
 path.0=classes.dex

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

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

src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml

@@ -36,8 +36,7 @@
     <application
         android:debuggable="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"

src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -36,8 +36,7 @@
     <application
         android:debuggable="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"

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

@@ -4,7 +4,11 @@
             "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
             "map": [
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -23,7 +27,11 @@
                     }
                 },
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "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",
@@ -47,6 +55,7 @@
             "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
             "map": [
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
                         "startLines": "18",
@@ -82,6 +91,26 @@
                 },
                 {
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "19,20,21,22,18",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "764,816,869,922,712",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "811,864,917,969,759"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
@@ -100,6 +129,7 @@
                     }
                 },
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
                         "startLines": "50,55,64,60,22,26,30,35,40,18,45",
@@ -120,6 +150,9 @@
                 },
                 {
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "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",
@@ -136,6 +169,45 @@
                         "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
+=======
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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": "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"
+                    },
+                    "to": {
+                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "712",
+                        "endColumns": "56",
+                        "endOffsets": "764"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                 }
             ]
         },
@@ -143,7 +215,11 @@
             "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
             "map": [
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -162,7 +238,11 @@
                     }
                 },
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",

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

@@ -4,7 +4,11 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
             "map": [
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -23,7 +27,11 @@
                     }
                 },
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "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",

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

@@ -4,7 +4,11 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
             "map": [
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -23,7 +27,11 @@
                     }
                 },
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",

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

@@ -4,6 +4,7 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
             "map": [
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
                         "startLines": "18",
@@ -39,6 +40,26 @@
                 },
                 {
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "19,20,21,22,18",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "764,816,869,922,712",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "811,864,917,969,759"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
@@ -57,6 +78,7 @@
                     }
                 },
                 {
+<<<<<<< HEAD
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
                         "startLines": "50,55,64,60,22,26,30,35,40,18,45",
@@ -77,6 +99,9 @@
                 },
                 {
                     "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
+=======
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                     "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",
@@ -93,6 +118,45 @@
                         "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
+=======
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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": "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"
+                    },
+                    "to": {
+                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "712",
+                        "endColumns": "56",
+                        "endOffsets": "764"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                 }
             ]
         }

src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml

@@ -36,8 +36,7 @@
     <application
         android:debuggable="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"