diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin
index 7662337..2667e8c 100644
Binary files a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin and b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock
index 90e51ec..0c77945 100644
Binary files a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock and b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin
index a1e787d..f0e74f8 100644
Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin and b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock
index 1c99e2d..19e6da5 100644
Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock and b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin
index 37067a5..82c6e54 100644
Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index bce8e79..0433800 100644
Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin
index cfa3777..55f2dfd 100644
Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/.gradle/file-system.probe
index aa118e5..3298851 100644
Binary files a/src/Notes-master3/.gradle/file-system.probe and b/src/Notes-master3/.gradle/file-system.probe differ
diff --git a/src/Notes-master3/.idea/vcs.xml b/src/Notes-master3/.idea/vcs.xml
new file mode 100644
index 0000000..b2bdec2
--- /dev/null
+++ b/src/Notes-master3/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk
index f17eba1..87e938d 100644
Binary files a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
index 66652a5..46dacc6 100644
--- a/src/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
+++ b/src/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
@@ -1,2 +1,2 @@
 #- File Locator -
-listingFile=../../../outputs/apk/debug/output-metadata.json
+listingFile=../../apk/debug/output-metadata.json
diff --git a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index a54964f..d872cf6 100644
Binary files a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
index 96c0b39..05723c3 100644
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
index 0d9dcf1..ba96481 100644
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
index 4e8f65e..2829ead 100644
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
index 1e7d85e..4c02437 100644
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
index e6d33c9..49e0bef 100644
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin
index f33b39b..5d1bc1e 100644
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_0/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_0/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_0/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_1/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_1/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_1/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_2/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_2/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_2/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_3/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_3/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_4/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_4/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_4/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_5/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_5/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_5/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_6/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_6/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_6/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_7/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_7/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_7/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_0/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_0/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_0/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_1/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_1/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_1/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_2/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_2/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_2/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_3/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_3/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_4/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_4/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_4/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_5/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_5/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_5/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_6/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_6/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_6/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_7/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_7/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6de610463914ee02b2ea4b7e61f6f08833b7ab9e8c8c43a0858f42ceca560b81_bucket_7/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index a060762..1490da0 100644
Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index 8271e32..b9ce3a2 100644
Binary files a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index 6746ba5..af6180f 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,294 +1,97 @@
-<<<<<<< HEAD
-#Fri Apr 14 16:36:22 CST 2023
-net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-7\:/raw/introduction=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\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=D\:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-=======
-<<<<<<< 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
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\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=D\:\\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=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\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=D\:\\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=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\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=D\:\\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=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\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=D\:\\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=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-7\:/raw/introduction=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\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=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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+#Fri May 26 16:56:20 CST 2023
+net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-7\:/layout/activity_login.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\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_white_single.9.png=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\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=D\:\\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=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\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_blue_single.9.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-7\:/raw/introduction=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\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=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\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/edit_title_red.9.png=D\:\\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=D\:\\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_green_up.9.png=D\:\\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=D\:\\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=D\:\\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_white_up.9.png=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\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/font_normal.png=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\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_red_single.9.png=D\:\\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/menu_move.png=D\:\\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=D\:\\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=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\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\:/xml/widget_4x_info.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\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=D\:\\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_green_middle.9.png=D\:\\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=D\:\\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_yellow_up.9.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\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=D\:\\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=D\:\\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=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\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/list_red_down.9.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\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=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\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=D\:\\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_red_up.9.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\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/widget_2x_info.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\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=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
deleted file mode 100644
index d65e0cc..0000000
--- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>邮件</item>
-    </string-array>
-    <plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
-    </plurals>
-    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
-    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
-    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
-    <string name="alert_title_delete">删除</string>
-    <string name="app_name">便签</string>
-    <string name="app_widget2x2">便签2x2</string>
-    <string name="app_widget4x4">便签4x4</string>
-    <string name="button_delete">删除</string>
-    <string name="call_record_folder_name">通话便签</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">设置</string>
-    <string name="delete_remind_time_message">成功删除提醒</string>
-    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
-    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
-    <string name="error_note_not_exist">要查看的便签不存在</string>
-    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
-    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
-    <string name="error_sync_cancelled">同步已取消</string>
-    <string name="error_sync_internal">同步失败，发生内部错误</string>
-    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
-    <string name="failed_sdcard_export">导出失败</string>
-    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
-    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
-    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
-    <string name="hint_foler_name">请输入名称</string>
-    <string name="info_note_enter_desktop">已添加到桌面</string>
-    <string name="menu_alert">提醒我</string>
-    <string name="menu_create_folder">新建文件夹</string>
-    <string name="menu_delete">删除</string>
-    <string name="menu_deselect_all">取消全选</string>
-    <string name="menu_export_text">导出文本</string>
-    <string name="menu_folder_change_name">修改文件夹名称</string>
-    <string name="menu_folder_delete">刪除文件夹</string>
-    <string name="menu_folder_view">查看文件夹</string>
-    <string name="menu_font_large">大</string>
-    <string name="menu_font_normal">正常</string>
-    <string name="menu_font_size">文字大小</string>
-    <string name="menu_font_small">小</string>
-    <string name="menu_font_super">超大</string>
-    <string name="menu_list_mode">进入清单模式</string>
-    <string name="menu_move">移动到文件夹</string>
-    <string name="menu_move_parent_folder">上一级文件夹</string>
-    <string name="menu_normal_mode">退出清单模式</string>
-    <string name="menu_remove_remind">删除提醒</string>
-    <string name="menu_search">搜索</string>
-    <string name="menu_select_all">全选</string>
-    <string name="menu_select_none">没有选中项，操作无效</string>
-    <string name="menu_select_title">选中了 %d 项</string>
-    <string name="menu_send_to_desktop">发送到桌面</string>
-    <string name="menu_setting">设置</string>
-    <string name="menu_share">分享</string>
-    <string name="menu_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</string>
-    <string name="menu_title_select_folder">选择文件夹</string>
-    <string name="note_alert_expired">已过期</string>
-    <string name="note_link_email">发送邮件</string>
-    <string name="note_link_other">打开地图</string>
-    <string name="note_link_tel">呼叫电话</string>
-    <string name="note_link_web">浏览网页</string>
-    <string name="notealert_enter">查看</string>
-    <string name="notealert_ok">知道了</string>
-    <string name="notelist_menu_new">新建便签</string>
-    <string name="notelist_string_info">...</string>
-    <string name="preferences_account_summary">与google task同步便签记录</string>
-    <string name="preferences_account_title">同步账号</string>
-    <string name="preferences_add_account">添加账号</string>
-    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
-    <string name="preferences_button_sync_cancel">取消同步</string>
-    <string name="preferences_button_sync_immediately">立即同步</string>
-    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
-    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
-    <string name="preferences_dialog_select_account_title">同步便签</string>
-    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
-    <string name="preferences_menu_cancel">取消</string>
-    <string name="preferences_menu_change_account">更换账号</string>
-    <string name="preferences_menu_remove_account">删除账号</string>
-    <string name="preferences_title">设置</string>
-    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
-    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
-    <string name="search">便签</string>
-    <string name="search_hint">搜索便签</string>
-    <string name="search_label">正在搜索便签</string>
-    <string name="search_setting_description">便签中的文字</string>
-    <string name="set_remind_time_message">创建提醒</string>
-    <string name="success_sdcard_export">导出成功</string>
-    <string name="success_sync_account">与%1$s同步成功</string>
-    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
-    <string name="sync_progress_login">登录%1$s...</string>
-    <string name="sync_progress_syncing">正在同步本地便签...</string>
-    <string name="ticker_cancel">同步已取消</string>
-    <string name="ticker_fail">同步失败</string>
-    <string name="ticker_success">同步成功</string>
-    <string name="ticker_syncing">同步便签...</string>
-    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
-    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
-</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
deleted file mode 100644
index 226b5bc..0000000
--- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>郵件</item>
-    </string-array>
-    <plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
-    </plurals>
-    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
-    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
-    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
-    <string name="alert_title_delete">刪除</string>
-    <string name="app_name">便簽</string>
-    <string name="app_widget2x2">便簽2x2</string>
-    <string name="app_widget4x4">便簽4x4</string>
-    <string name="button_delete">刪除</string>
-    <string name="call_record_folder_name">通話便籤</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">設置</string>
-    <string name="delete_remind_time_message">成功刪除提醒</string>
-    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
-    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
-    <string name="error_note_not_exist">要查看的便籤不存在</string>
-    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
-    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
-    <string name="error_sync_cancelled">同步已取消</string>
-    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
-    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
-    <string name="failed_sdcard_export">導出失敗</string>
-    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
-    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
-    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
-    <string name="hint_foler_name">請輸入名稱</string>
-    <string name="info_note_enter_desktop">已添加到桌面</string>
-    <string name="menu_alert">提醒我</string>
-    <string name="menu_create_folder">新建文件夾</string>
-    <string name="menu_delete">刪除</string>
-    <string name="menu_deselect_all">取消全選</string>
-    <string name="menu_export_text">導出文本</string>
-    <string name="menu_folder_change_name">修改文件夾名稱</string>
-    <string name="menu_folder_delete">刪除文件夾</string>
-    <string name="menu_folder_view">查看文件夾</string>
-    <string name="menu_font_large">大</string>
-    <string name="menu_font_normal">正常</string>
-    <string name="menu_font_size">文字大小</string>
-    <string name="menu_font_small">小</string>
-    <string name="menu_font_super">超大</string>
-    <string name="menu_list_mode">進入清單模式</string>
-    <string name="menu_move">移動到文件夾</string>
-    <string name="menu_move_parent_folder">上一級文件夾</string>
-    <string name="menu_normal_mode">退出清單模式</string>
-    <string name="menu_remove_remind">刪除提醒</string>
-    <string name="menu_search">搜尋</string>
-    <string name="menu_select_all">全選</string>
-    <string name="menu_select_none">沒有選中項，操作無效</string>
-    <string name="menu_select_title">選中了 %d 項</string>
-    <string name="menu_send_to_desktop">發送到桌面</string>
-    <string name="menu_setting">設置</string>
-    <string name="menu_share">分享</string>
-    <string name="menu_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</string>
-    <string name="menu_title_select_folder">選擇文件夾</string>
-    <string name="note_alert_expired">已過期</string>
-    <string name="note_link_email">發送郵件</string>
-    <string name="note_link_other">打開地圖</string>
-    <string name="note_link_tel">呼叫電話</string>
-    <string name="note_link_web">浏覽網頁</string>
-    <string name="notealert_enter">查看</string>
-    <string name="notealert_ok">知道了</string>
-    <string name="notelist_menu_new">新建便簽</string>
-    <string name="notelist_string_info">...</string>
-    <string name="preferences_account_summary">与google task同步便簽記錄</string>
-    <string name="preferences_account_title">同步賬號</string>
-    <string name="preferences_add_account">添加賬號</string>
-    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
-    <string name="preferences_button_sync_cancel">取消同步</string>
-    <string name="preferences_button_sync_immediately">立即同步</string>
-    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
-    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
-    <string name="preferences_dialog_select_account_title">同步便簽</string>
-    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
-    <string name="preferences_menu_cancel">取消</string>
-    <string name="preferences_menu_change_account">更換賬號</string>
-    <string name="preferences_menu_remove_account">刪除賬號</string>
-    <string name="preferences_title">設置</string>
-    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
-    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
-    <string name="search">便籤</string>
-    <string name="search_hint">搜索便籤</string>
-    <string name="search_label">正在搜索便籤</string>
-    <string name="search_setting_description">便籤中的文字</string>
-    <string name="set_remind_time_message">創建提醒</string>
-    <string name="success_sdcard_export">導出成功</string>
-    <string name="success_sync_account">與%1$s同步成功</string>
-    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
-    <string name="sync_progress_login">登陸%1$s...</string>
-    <string name="sync_progress_syncing">正在同步本地便籤...</string>
-    <string name="ticker_cancel">同步已取消</string>
-    <string name="ticker_fail">同步失敗</string>
-    <string name="ticker_success">同步成功</string>
-    <string name="ticker_syncing">同步便簽...</string>
-    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
-    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
-</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
index e49b0c3..9e54930 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@@ -21,15 +21,18 @@
         
         <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
     </plurals>
+    <string name="Loading">Loading</string>
     <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
     <string name="alert_message_delete_note">Confirm to delete this note?</string>
     <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
     <string name="alert_title_delete">Delete selected notes</string>
+    <string name="app_already_quit">quit</string>
     <string name="app_name">Notes</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
     <string name="button_delete">Delete</string>
     <string name="call_record_folder_name">Call notes</string>
+    <string name="cancel">cancel</string>
     <string name="datetime_dialog_cancel">cancel</string>
     <string name="datetime_dialog_ok">set</string>
     <string name="delete_remind_time_message">Delete reminder successfully</string>
@@ -52,6 +55,7 @@
     <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
     <string name="hint_foler_name">Input name</string>
     <string name="info_note_enter_desktop">Note added to home</string>
+    <string name="invalid">invalid</string>
     <string name="menu_alert">Remind me</string>
     <string name="menu_create_folder">New Folder</string>
     <string name="menu_delete">Delete</string>
@@ -107,6 +111,8 @@
     <string name="preferences_title">Settings</string>
     <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
     <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
+    <string name="prompt_account">accounnt</string>
+    <string name="prompt_password">password</string>
     <string name="search">Notes</string>
     <string name="search_hint">Search notes</string>
     <string name="search_label">Searching Notes</string>
@@ -115,7 +121,7 @@
     <string name="success_sdcard_export">Export successful</string>
     <string name="success_sync_account">Sync is successful with account %1$s</string>
     <string name="sync_progress_init_list">Getting remote note list...</string>
-    <string name="sync_progress_login">Logging into %1$s...</string>
+    <string name="sync_progress_login">Logging</string>
     <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
     <string name="ticker_cancel">Sync is canceled</string>
     <string name="ticker_fail">Sync is failed</string>
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index 64ae73e..114c9e8 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res"/><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\build\generated\res\rs\debug"/><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res"><file name="primary_text_dark" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
-=======
-<<<<<<< HEAD
-<merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\res"/><source path="D:\Notes-master3\app\build\generated\res\rs\debug"/><source path="D:\Notes-master3\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\res"><file name="primary_text_dark" path="D:\Notes-master3\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\Notes-master3\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\Notes-master3\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\Notes-master3\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\Notes-master3\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\Notes-master3\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\Notes-master3\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\Notes-master3\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\Notes-master3\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\Notes-master3\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\Notes-master3\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\Notes-master3\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\Notes-master3\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\Notes-master3\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\Notes-master3\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\Notes-master3\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\Notes-master3\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\Notes-master3\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\Notes-master3\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\Notes-master3\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\Notes-master3\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\Notes-master3\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\Notes-master3\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\Notes-master3\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\Notes-master3\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\Notes-master3\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\Notes-master3\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
-=======
-<merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" 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\res"/><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\rs\debug"/><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" 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\res"><file name="primary_text_dark" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
->>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+<merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitProject\src\Notes-master3\app\src\main\res"/><source path="D:\gitProject\src\Notes-master3\app\build\generated\res\rs\debug"/><source path="D:\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitProject\src\Notes-master3\app\src\main\res"><file name="primary_text_dark" path="D:\gitProject\src\Notes-master3\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\gitProject\src\Notes-master3\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\gitProject\src\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\gitProject\src\Notes-master3\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\gitProject\src\Notes-master3\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\gitProject\src\Notes-master3\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\gitProject\src\Notes-master3\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\gitProject\src\Notes-master3\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\gitProject\src\Notes-master3\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\gitProject\src\Notes-master3\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\gitProject\src\Notes-master3\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\gitProject\src\Notes-master3\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\gitProject\src\Notes-master3\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
         <item>-%s</item>      
         <item>--%s</item>     
         <item>--%s</item>     
@@ -15,27 +7,11 @@
     </string-array><string-array name="menu_share_ways">
         <item>Messaging</item>
         <item>Email</item>
-<<<<<<< HEAD
-    </string-array></file><file path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><plurals name="search_results_title">
+    </string-array></file><file path="D:\gitProject\src\Notes-master3\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\gitProject\src\Notes-master3\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="D:\gitProject\src\Notes-master3\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><plurals name="search_results_title">
          <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
         
         <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals></file><file path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
-=======
-<<<<<<< HEAD
-    </string-array></file><file path="D:\Notes-master3\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\Notes-master3\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="D:\Notes-master3\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><plurals name="search_results_title">
-         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-        
-        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals></file><file path="D:\Notes-master3\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
-=======
-    </string-array></file><file path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><plurals name="search_results_title">
-         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-        
-        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals></file><file path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
->>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+    </plurals><string name="prompt_account">accounnt</string><string name="prompt_password">password</string><string name="app_already_quit">quit</string><string name="Loading">Loading</string><string name="invalid">invalid</string><string name="cancel">cancel</string></file><file path="D:\gitProject\src\Notes-master3\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
         <item name="android:textSize">@dimen/text_font_size_super</item>
         <item name="android:textColorLink">#0000ff</item>
     </style><style name="TextAppearanceLarge">
@@ -67,36 +43,14 @@
     </style><style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
         <item name="android:displayOptions"/>
         <item name="android:visibility">gone</item>
-<<<<<<< HEAD
-    </style></file><file path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
-=======
-<<<<<<< HEAD
-    </style></file><file path="D:\Notes-master3\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>邮件</item>
-    </string-array></file><file path="D:\Notes-master3\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
-    </plurals></file><file path="D:\Notes-master3\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>郵件</item>
-    </string-array></file><file path="D:\Notes-master3\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
-    </plurals></file><file name="preferences" path="D:\Notes-master3\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\Notes-master3\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\Notes-master3\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\Notes-master3\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="D:\Notes-master3\app\build\generated\res\rs\debug"/><source path="D:\Notes-master3\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\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:!*~"/><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:!*~"/><mergedItems/></merger>
-=======
-    </style></file><file path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+    </style></file><file path="D:\gitProject\src\Notes-master3\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
         <item>短信</item>
         <item>邮件</item>
-    </string-array></file><file path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
+    </string-array></file><file path="D:\gitProject\src\Notes-master3\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
         <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
-    </plurals></file><file path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
+    </plurals></file><file path="D:\gitProject\src\Notes-master3\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
         <item>短信</item>
         <item>郵件</item>
-    </string-array></file><file path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
+    </string-array></file><file path="D:\gitProject\src\Notes-master3\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
         <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
-<<<<<<< HEAD
-    </plurals></file><file name="preferences" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\build\generated\res\rs\debug"/><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\debug\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:!*~"/><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:!*~"/><mergedItems/></merger>
-=======
-    </plurals></file><file name="preferences" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\rs\debug"/><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" 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\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" 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\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:!*~"/><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:!*~"/><mergedItems/></merger>
->>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+    </plurals></file><file name="preferences" path="D:\gitProject\src\Notes-master3\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\gitProject\src\Notes-master3\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\gitProject\src\Notes-master3\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\gitProject\src\Notes-master3\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/><file name="activity_login" path="D:\gitProject\src\Notes-master3\app\src\main\res\layout\activity_login.xml" qualifiers="" type="layout"/><file path="D:\gitProject\src\Notes-master3\app\src\main\res\values\refs.xml" qualifiers=""/></source><source path="D:\gitProject\src\Notes-master3\app\build\generated\res\rs\debug"/><source path="D:\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitProject\src\Notes-master3\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitProject\src\Notes-master3\app\src\debug\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:!*~"/><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:!*~"/><mergedItems/></merger>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 4111d64..714a82f 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\assets"/><source path="D:\study\rjgc\wrok\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="D:\study\rjgc\wrok\gitProject\src\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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitProject\src\Notes-master3\app\src\main\assets"/><source path="D:\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="D:\gitProject\src\Notes-master3\app\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index ecc5b17..b7331d1 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\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="D:\study\rjgc\wrok\gitProject\src\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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\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="D:\gitProject\src\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index 9c74751..332d2f9 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\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="D:\study\rjgc\wrok\gitProject\src\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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\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="D:\gitProject\src\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index ddf2eac..4eb2bab 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,14 +1,4 @@
-<<<<<<< HEAD
-#Fri Apr 14 16:36:26 CST 2023
-base.0=D\:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
-=======
-<<<<<<< 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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+#Fri May 26 16:56:20 CST 2023
+base.0=D\:\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex
diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 6175049..94537f1 100644
Binary files a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
index 7299c91..c24bbd5 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
index 5aae52d..1e4c188 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
index bfb671c..a7bfab1 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
index ed4ac8e..a5167e2 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index 79598f6..b6106f0 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index ff95cab..39f05b6 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
index 81d6513..78a70d7 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index 5012ef9..22cb8a9 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index 354ae8e..2f21353 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index ad7cce4..207f5ad 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 93cd34b..3ffc146 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index 864ac3f..c17fabb 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index fe615e5..f2cbea2 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index 6cb3e5c..e7fac12 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 03e742a..aa7f331 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index 1e80cb2..fdc0156 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index 95c7b5b..e7350b8 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index c500eba..872574a 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index ca8227c..84eb40c 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index b42fab7..3432bfd 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index 6b50285..c93b937 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
index 265b0b7..9ca5865 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
index 0eaab60..800c678 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
index e315716..1b35381 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ
diff --git a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index 6b6a53d..0d6799c 100644
--- a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -20,535 +20,296 @@
 20    android:versionName="0.1" >
 21
 22    <uses-sdk
-<<<<<<< HEAD
-22-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-=======
-<<<<<<< HEAD
-22-->D:\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+22-->D:\gitProject\src\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
+23-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
 24        android:targetSdkVersion="33" />
-24-->D:\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+24-->D:\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-->D:\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
-26-->D:\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
+26-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
+26-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
 27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->D:\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
-27-->D:\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
+27-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
+27-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
 28    <uses-permission android:name="android.permission.INTERNET" />
-28-->D:\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
-28-->D:\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
+28-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
+28-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
 29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->D:\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
-29-->D:\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
+29-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
+29-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
 30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->D:\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
-30-->D:\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
+30-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
+30-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
 31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->D:\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
-31-->D:\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
+31-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
+31-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
 32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->D:\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
-32-->D:\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
+32-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
+32-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
 33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->D:\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
-33-->D:\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
+33-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
+33-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
 34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->D:\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
-34-->D:\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
+34-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
+34-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
 35
 36    <application
-36-->D:\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
+36-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-178:15
 37        android:debuggable="true"
 38        android:icon="@drawable/icon_app"
-38-->D:\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
+38-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
 39        android:label="@string/app_name"
-39-->D:\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
+39-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
 40        android:testOnly="true" >
 41        <activity
-41-->D:\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
-42            android:name="net.micode.notes.ui.NotesListActivity"
-42-->D:\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
-43            android:configChanges="keyboardHidden|orientation|screenSize"
-43-->D:\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
-44            android:exported="true"
-44-->D:\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
-45            android:launchMode="singleTop"
-45-->D:\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
-46            android:theme="@style/NoteTheme"
-46-->D:\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
-47            android:uiOptions="splitActionBarWhenNarrow"
-47-->D:\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
-48            android:windowSoftInputMode="adjustPan" >
-48-->D:\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
-49            <intent-filter>
-49-->D:\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
-50                <action android:name="android.intent.action.MAIN" />
-50-->D:\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
-50-->D:\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
-51
-52                <category android:name="android.intent.category.LAUNCHER" />
-52-->D:\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77
-52-->D:\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74
-53            </intent-filter>
-54        </activity>
-55        <activity
-55-->D:\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
-56            android:name="net.micode.notes.ui.NoteEditActivity"
-56-->D:\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
-57            android:configChanges="keyboardHidden|orientation|screenSize"
-57-->D:\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
-58            android:exported="true"
-58-->D:\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
-59            android:launchMode="singleTop"
-59-->D:\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
-60            android:theme="@style/NoteTheme" >
-60-->D:\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
-61            <intent-filter android:scheme="http" >
-61-->D:\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
-61-->D:\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
-62                <action android:name="android.intent.action.VIEW" />
-62-->D:\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69
-62-->D:\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66
-63
-64                <category android:name="android.intent.category.DEFAULT" />
-64-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-64-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-65
-66                <data android:mimeType="vnd.android.cursor.item/text_note" />
-66-->D:\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-66-->D:\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-67                <data android:mimeType="vnd.android.cursor.item/call_note" />
-67-->D:\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-67-->D:\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-68            </intent-filter>
+41-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-58:16
+42            android:name="net.micode.notes.ui.LoginActivity"
+42-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-45
+43            android:exported="true"
+43-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-36
+44            android:label="@string/app_name"
+44-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-45
+45            android:theme="@style/NoteTheme" >
+45-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
+46
+47            <!--
+48        android:configChanges="keyboardHidden|orientation|screenSize"
+49        android:exported="true"
+50        android:launchMode="singleTop"
+51        android:theme="@style/NoteTheme"
+52        android:uiOptions="splitActionBarWhenNarrow"
+53        android:windowSoftInputMode="adjustPan">
+54            -->
+55            <intent-filter>
+55-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:54:9-57:25
+56                <action android:name="android.intent.action.MAIN" />
+56-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:13-65
+56-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:21-62
+57
+58                <category android:name="android.intent.category.LAUNCHER" />
+58-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-73
+58-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:23-70
+59            </intent-filter>
+60        </activity>
+61        <activity
+61-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:9-73:20
+62            android:name="net.micode.notes.ui.NotesListActivity"
+62-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-49
+63            android:configChanges="keyboardHidden|orientation|screenSize"
+63-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:61:13-74
+64            android:exported="true"
+64-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-36
+65            android:launchMode="singleTop"
+65-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:13-43
+66            android:theme="@style/NoteTheme"
+66-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:13-45
+67            android:uiOptions="splitActionBarWhenNarrow"
+67-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:13-57
+68            android:windowSoftInputMode="adjustPan" >
+68-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:13-52
 69            <intent-filter>
-69-->D:\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
-70                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-70-->D:\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79
-70-->D:\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76
+69-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:54:9-57:25
+70                <action android:name="android.intent.action.MAIN" />
+70-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:13-65
+70-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:21-62
 71
-72                <category android:name="android.intent.category.DEFAULT" />
-72-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-72-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-73
-74                <data android:mimeType="vnd.android.cursor.item/text_note" />
-74-->D:\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-74-->D:\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-75                <data android:mimeType="vnd.android.cursor.item/call_note" />
-75-->D:\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-75-->D:\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-76            </intent-filter>
-77            <intent-filter>
-77-->D:\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
-78                <action android:name="android.intent.action.SEARCH" />
-78-->D:\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71
-78-->D:\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68
-79
-80                <category android:name="android.intent.category.DEFAULT" />
-80-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-80-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-81            </intent-filter>
-82
-83            <meta-data
-83-->D:\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
-84                android:name="android.app.searchable"
-84-->D:\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
-85                android:resource="@xml/searchable" />
-85-->D:\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
-86        </activity>
-87
-88        <provider
-88-->D:\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
-89            android:name="net.micode.notes.data.NotesProvider"
-89-->D:\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
-90            android:authorities="micode_notes"
-90-->D:\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
-91            android:exported="false"
-91-->D:\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
-92            android:multiprocess="true" />
-92-->D:\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
+72                <category android:name="android.intent.category.LAUNCHER" />
+72-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-73
+72-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:23-70
+73            </intent-filter>
+74        </activity>
+75        <activity
+75-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:75:5-105:16
+76            android:name="net.micode.notes.ui.NoteEditActivity"
+76-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:76:9-44
+77            android:configChanges="keyboardHidden|orientation|screenSize"
+77-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:9-70
+78            android:exported="true"
+78-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:80:9-32
+79            android:launchMode="singleTop"
+79-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:9-39
+80            android:theme="@style/NoteTheme" >
+80-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:79:9-41
+81            <intent-filter android:scheme="http" >
+81-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:9-88:25
+81-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:24-45
+82                <action android:name="android.intent.action.VIEW" />
+82-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:13-65
+82-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:21-62
+83
+84                <category android:name="android.intent.category.DEFAULT" />
+84-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:85:13-72
+84-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:85:23-69
+85
+86                <data android:mimeType="vnd.android.cursor.item/text_note" />
+86-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:86:13-74
+86-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:86:19-71
+87                <data android:mimeType="vnd.android.cursor.item/call_note" />
+87-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:86:13-74
+87-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:86:19-71
+88            </intent-filter>
+89            <intent-filter>
+89-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:9-95:25
+90                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+90-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-75
+90-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:21-72
+91
+92                <category android:name="android.intent.category.DEFAULT" />
+92-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:85:13-72
+92-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:85:23-69
 93
-94        <receiver
-94-->D:\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
-95            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-95-->D:\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
-96            android:exported="true"
-96-->D:\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
-97            android:label="@string/app_widget2x2" >
-97-->D:\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
-98            <intent-filter>
-98-->D:\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
-99                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-99-->D:\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
-99-->D:\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
-100                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-100-->D:\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
-100-->D:\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
-101                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-101-->D:\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
-101-->D:\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
-102            </intent-filter>
-103
-104            <meta-data
-104-->D:\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
-105                android:name="android.appwidget.provider"
-105-->D:\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
-106                android:resource="@xml/widget_2x_info" />
-106-->D:\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
-107        </receiver>
-108        <receiver
-108-->D:\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
-109            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-109-->D:\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
-110            android:exported="true"
-110-->D:\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
-111            android:label="@string/app_widget4x4" >
-111-->D:\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
-112            <intent-filter>
-112-->D:\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
-113                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-113-->D:\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
-113-->D:\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
-114                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-114-->D:\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
-114-->D:\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
-115                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-115-->D:\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
-115-->D:\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
-116            </intent-filter>
-117
-118            <meta-data
-118-->D:\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
-119                android:name="android.appwidget.provider"
-119-->D:\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
-120                android:resource="@xml/widget_4x_info" />
-120-->D:\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
-121        </receiver>
-122        <receiver
-122-->D:\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
-123            android:name="net.micode.notes.ui.AlarmInitReceiver"
-123-->D:\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
-124            android:exported="true" >
-124-->D:\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
-125            <intent-filter>
-125-->D:\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
-126                <action android:name="android.intent.action.BOOT_COMPLETED" />
-126-->D:\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79
-126-->D:\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76
-127            </intent-filter>
-128        </receiver>
-129        <receiver
-129-->D:\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
-130            android:name="net.micode.notes.ui.AlarmReceiver"
-130-->D:\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
-131            android:process=":remote" >
-131-->D:\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
-132        </receiver>
-133
-134        <activity
-134-->D:\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
-135            android:name="net.micode.notes.ui.AlarmAlertActivity"
-135-->D:\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
-136            android:label="@string/app_name"
-136-->D:\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
-137            android:launchMode="singleInstance"
-137-->D:\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
-138            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-138-->D:\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
-139        </activity>
-140        <activity
-140-->D:\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
-141            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-141-->D:\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
-142            android:label="@string/preferences_title"
-142-->D:\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
-143            android:launchMode="singleTop"
-143-->D:\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
-144            android:theme="@android:style/Theme.Holo.Light" >
-144-->D:\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
-145        </activity>
-146
-147        <service
-147-->D:\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
-148            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-148-->D:\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
-149            android:exported="false" >
-149-->D:\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
-150        </service>
-151
-152        <meta-data
-152-->D:\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
-153            android:name="android.app.default_searchable"
-153-->D:\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
-154            android:value=".ui.NoteEditActivity" />
-154-->D:\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
-155    </application>
-156
-157</manifest>
-=======
-22-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
-23        android:minSdkVersion="14"
-23-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
-24        android:targetSdkVersion="33" />
-24-->D:\study\rjgc\wrok\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-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
-26-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
-27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
-27-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
-28    <uses-permission android:name="android.permission.INTERNET" />
-28-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
-28-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
-29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
-29-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
-30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
-30-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
-31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
-31-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
-32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
-32-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
-33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
-33-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
-34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
-34-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
-35
-36    <application
-36-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
-37        android:debuggable="true"
-38        android:icon="@drawable/icon_app"
-38-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
-39        android:label="@string/app_name" >
-39-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
-40        <activity
-40-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
-41            android:name="net.micode.notes.ui.NotesListActivity"
-41-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
-42            android:configChanges="keyboardHidden|orientation|screenSize"
-42-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
-43            android:exported="true"
-43-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
-44            android:launchMode="singleTop"
-44-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
-45            android:theme="@style/NoteTheme"
-45-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
-46            android:uiOptions="splitActionBarWhenNarrow"
-46-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
-47            android:windowSoftInputMode="adjustPan" >
-47-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
-48            <intent-filter>
-48-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
-49                <action android:name="android.intent.action.MAIN" />
-49-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
-49-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
-50
-51                <category android:name="android.intent.category.LAUNCHER" />
-51-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77
-51-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74
-52            </intent-filter>
-53        </activity>
-54        <activity
-54-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
-55            android:name="net.micode.notes.ui.NoteEditActivity"
-55-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
-56            android:configChanges="keyboardHidden|orientation|screenSize"
-56-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
-57            android:exported="true"
-57-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
-58            android:launchMode="singleTop"
-58-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
-59            android:theme="@style/NoteTheme" >
-59-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
-60            <intent-filter android:scheme="http" >
-60-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
-60-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
-61                <action android:name="android.intent.action.VIEW" />
-61-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69
-61-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66
-62
-63                <category android:name="android.intent.category.DEFAULT" />
-63-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-63-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-64
-65                <data android:mimeType="vnd.android.cursor.item/text_note" />
-65-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-65-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-66                <data android:mimeType="vnd.android.cursor.item/call_note" />
-66-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-66-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-67            </intent-filter>
-68            <intent-filter>
-68-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
-69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-69-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79
-69-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76
-70
-71                <category android:name="android.intent.category.DEFAULT" />
-71-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-71-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-72
-73                <data android:mimeType="vnd.android.cursor.item/text_note" />
-73-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-73-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-74                <data android:mimeType="vnd.android.cursor.item/call_note" />
-74-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-74-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-75            </intent-filter>
-76            <intent-filter>
-76-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
-77                <action android:name="android.intent.action.SEARCH" />
-77-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71
-77-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68
-78
-79                <category android:name="android.intent.category.DEFAULT" />
-79-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-79-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-80            </intent-filter>
-81
-82            <meta-data
-82-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
-83                android:name="android.app.searchable"
-83-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
-84                android:resource="@xml/searchable" />
-84-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
-85        </activity>
-86
-87        <provider
-87-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
-88            android:name="net.micode.notes.data.NotesProvider"
-88-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
-89            android:authorities="micode_notes"
-89-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
-90            android:exported="false"
-90-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
-91            android:multiprocess="true" />
-91-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
-92
-93        <receiver
-93-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
-94            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-94-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
-95            android:exported="true"
-95-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
-96            android:label="@string/app_widget2x2" >
-96-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
+94                <data android:mimeType="vnd.android.cursor.item/text_note" />
+94-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:86:13-74
+94-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:86:19-71
+95                <data android:mimeType="vnd.android.cursor.item/call_note" />
+95-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:86:13-74
+95-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:86:19-71
+96            </intent-filter>
 97            <intent-filter>
-97-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
-98                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-98-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
-98-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
-99                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-99-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
-99-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
-100                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-100-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
-100-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
+97-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:9-100:25
+98                <action android:name="android.intent.action.SEARCH" />
+98-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:13-67
+98-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:21-64
+99
+100                <category android:name="android.intent.category.DEFAULT" />
+100-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:85:13-72
+100-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:85:23-69
 101            </intent-filter>
 102
 103            <meta-data
-103-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
-104                android:name="android.appwidget.provider"
-104-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
-105                android:resource="@xml/widget_2x_info" />
-105-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
-106        </receiver>
-107        <receiver
-107-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
-108            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-108-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
-109            android:exported="true"
-109-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
-110            android:label="@string/app_widget4x4" >
-110-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
-111            <intent-filter>
-111-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
-112                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-112-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
-112-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
-113                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-113-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
-113-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
-114                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-114-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
-114-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
-115            </intent-filter>
-116
-117            <meta-data
-117-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
-118                android:name="android.appwidget.provider"
-118-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
-119                android:resource="@xml/widget_4x_info" />
-119-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
-120        </receiver>
-121        <receiver
-121-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
-122            android:name="net.micode.notes.ui.AlarmInitReceiver"
-122-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
-123            android:exported="true" >
-123-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
-124            <intent-filter>
-124-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
-125                <action android:name="android.intent.action.BOOT_COMPLETED" />
-125-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79
-125-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76
-126            </intent-filter>
+103-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:102:9-104:50
+104                android:name="android.app.searchable"
+104-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-50
+105                android:resource="@xml/searchable" />
+105-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:13-47
+106        </activity>
+107
+108        <provider
+108-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:5-111:36
+109            android:name="net.micode.notes.data.NotesProvider"
+109-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:9-59
+110            android:authorities="micode_notes"
+110-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:9-43
+111            android:exported="false"
+111-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:111:9-33
+112            android:multiprocess="true" />
+112-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:9-36
+113
+114        <receiver
+114-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:113:5-126:16
+115            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+115-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:114:9-53
+116            android:exported="true"
+116-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:116:9-32
+117            android:label="@string/app_widget2x2" >
+117-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:115:9-46
+118            <intent-filter>
+118-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:117:9-121:25
+119                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+119-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:118:13-80
+119-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:118:21-77
+120                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+120-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:119:13-81
+120-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:119:21-78
+121                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+121-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:120:13-81
+121-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:120:21-78
+122            </intent-filter>
+123
+124            <meta-data
+124-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-125:54
+125                android:name="android.appwidget.provider"
+125-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-54
+126                android:resource="@xml/widget_2x_info" />
+126-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-51
 127        </receiver>
 128        <receiver
-128-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
-129            android:name="net.micode.notes.ui.AlarmReceiver"
-129-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
-130            android:process=":remote" >
-130-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
-131        </receiver>
-132
-133        <activity
-133-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
-134            android:name="net.micode.notes.ui.AlarmAlertActivity"
-134-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
-135            android:label="@string/app_name"
-135-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
-136            android:launchMode="singleInstance"
-136-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
-137            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-137-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
-138        </activity>
-139        <activity
-139-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
-140            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-140-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
-141            android:label="@string/preferences_title"
-141-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
-142            android:launchMode="singleTop"
-142-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
-143            android:theme="@android:style/Theme.Holo.Light" >
-143-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
-144        </activity>
-145
-146        <service
-146-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
-147            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-147-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
-148            android:exported="false" >
-148-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
-149        </service>
-150
-151        <meta-data
-151-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
-152            android:name="android.app.default_searchable"
-152-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
-153            android:value=".ui.NoteEditActivity" />
-153-->D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
-154    </application>
-155
-156</manifest>
->>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
+128-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:127:5-141:16
+129            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+129-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:128:9-53
+130            android:exported="true"
+130-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-32
+131            android:label="@string/app_widget4x4" >
+131-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:129:9-46
+132            <intent-filter>
+132-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:117:9-121:25
+133                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+133-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:118:13-80
+133-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:118:21-77
+134                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+134-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:119:13-81
+134-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:119:21-78
+135                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+135-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:120:13-81
+135-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:120:21-78
+136            </intent-filter>
+137
+138            <meta-data
+138-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-125:54
+139                android:name="android.appwidget.provider"
+139-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-54
+140                android:resource="@xml/widget_4x_info" />
+140-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-51
+141        </receiver>
+142        <receiver
+142-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:5-148:16
+143            android:name="net.micode.notes.ui.AlarmInitReceiver"
+143-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:15-51
+144            android:exported="true" >
+144-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:9-32
+145            <intent-filter>
+145-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:9-147:25
+146                <action android:name="android.intent.action.BOOT_COMPLETED" />
+146-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-75
+146-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:21-72
+147            </intent-filter>
+148        </receiver>
+149        <receiver
+149-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:5-153:16
+150            android:name="net.micode.notes.ui.AlarmReceiver"
+150-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:9-57
+151            android:process=":remote" >
+151-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:9-34
+152        </receiver>
+153
+154        <activity
+154-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:5-161:16
+155            android:name="net.micode.notes.ui.AlarmAlertActivity"
+155-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:9-46
+156            android:label="@string/app_name"
+156-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:9-41
+157            android:launchMode="singleInstance"
+157-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:158:9-44
+158            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+158-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:159:9-71
+159        </activity>
+160        <activity
+160-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:163:5-168:16
+161            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+161-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:164:9-67
+162            android:label="@string/preferences_title"
+162-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:165:9-50
+163            android:launchMode="singleTop"
+163-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:166:9-39
+164            android:theme="@android:style/Theme.Holo.Light" >
+164-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:167:9-56
+165        </activity>
+166
+167        <service
+167-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:170:5-173:15
+168            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+168-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:171:9-70
+169            android:exported="false" >
+169-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:172:9-33
+170        </service>
+171
+172        <meta-data
+172-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:175:5-177:48
+173            android:name="android.app.default_searchable"
+173-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:176:9-54
+174            android:value=".ui.NoteEditActivity" />
+174-->D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:177:9-45
+175    </application>
+176
+177</manifest>
diff --git a/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
index 4ce9215..868e626 100644
--- a/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -36,7 +36,28 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
+        <activity
+            android:name="net.micode.notes.ui.LoginActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/NoteTheme" >
+
+            <!--
+        android:configChanges="keyboardHidden|orientation|screenSize"
+        android:exported="true"
+        android:launchMode="singleTop"
+        android:theme="@style/NoteTheme"
+        android:uiOptions="splitActionBarWhenNarrow"
+        android:windowSoftInputMode="adjustPan">
+            -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index 4ce9215..868e626 100644
--- a/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -36,7 +36,28 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
+        <activity
+            android:name="net.micode.notes.ui.LoginActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/NoteTheme" >
+
+            <!--
+        android:configChanges="keyboardHidden|orientation|screenSize"
+        android:exported="true"
+        android:launchMode="singleTop"
+        android:theme="@style/NoteTheme"
+        android:uiOptions="splitActionBarWhenNarrow"
+        android:windowSoftInputMode="adjustPan">
+            -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index ea0ebfc..bd7ab3b 100644
Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index 14362a9..31ac5be 100644
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -1,18 +1,96 @@
 {
     "logs": [
         {
-            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
+            "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
             "map": [
                 {
-<<<<<<< HEAD
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-=======
-<<<<<<< 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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "131,135,139,143,146,150,154,158,162,166,170",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8396,8600,8811,9018,9178,9361,9546,9731,9934,10140,10323",
+                        "endLines": "134,138,142,145,149,153,157,161,165,169,173",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8595,8806,9013,9173,9356,9541,9726,9929,10135,10318,10519"
+                    }
+                },
+                {
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "D:\\gitProject\\src\\Notes-master3\\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:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8414,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8123,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8822,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8160,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "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,125,126,127,128,129,130",
+                        "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,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1136,1232,1315,1411,1480,1530,1573,1625,1677,1726,1789,1831,1889,1940,2024,2118,2226,2297,2381,2464,2530,2613,2715,2776,2838,2889,2967,3020,3080,3185,3244,3346,3401,3472,3516,3565,3623,3670,3729,3786,3857,3918,3975,4025,4077,4130,4180,4230,4290,4343,4409,4471,4534,4581,4636,4724,4782,4844,4894,4939,4982,5042,5109,5164,5219,5272,5319,5372,5428,5476,5531,5584,5668,5735,5799,5895,5969,6050,6139,6302,6446,6525,6600,6682,6741,6821,6901,6956,7078,7181,7233,7286,7327,7380,7437,7511,7576,7644,7730,7810,7866,7960,8019,8074,8136,8196,8306",
+                        "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,125,126,127,128,129,130",
+                        "endColumns": "14,43,95,82,95,68,49,42,51,51,48,62,41,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,43,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,51,52,40,52,56,73,64,67,85,79,55,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1131,1227,1310,1406,1475,1525,1568,1620,1672,1721,1784,1826,1884,1935,2019,2113,2221,2292,2376,2459,2525,2608,2710,2771,2833,2884,2962,3015,3075,3180,3239,3341,3396,3467,3511,3560,3618,3665,3724,3781,3852,3913,3970,4020,4072,4125,4175,4225,4285,4338,4404,4466,4529,4576,4631,4719,4777,4839,4889,4934,4977,5037,5104,5159,5214,5267,5314,5367,5423,5471,5526,5579,5663,5730,5794,5890,5964,6045,6134,6297,6441,6520,6595,6677,6736,6816,6896,6951,7073,7176,7228,7281,7322,7375,7432,7506,7571,7639,7725,7805,7861,7955,8014,8069,8131,8191,8301,8391"
+                    }
+                },
+                {
+                    "source": "D:\\gitProject\\src\\Notes-master3\\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\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -31,15 +109,7 @@
                     }
                 },
                 {
-<<<<<<< HEAD
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-=======
-<<<<<<< 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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+                    "source": "D:\\gitProject\\src\\Notes-master3\\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",
@@ -60,79 +130,36 @@
             ]
         },
         {
-            "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
+            "outputFile": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat",
             "map": [
                 {
-<<<<<<< HEAD
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
-=======
-<<<<<<< HEAD
-                    "source": "D:\\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"
-                    }
-                },
-                {
-                    "source": "D:\\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": "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",
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "730",
-                        "endColumns": "56",
-                        "endOffsets": "782"
+                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
+                        "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"
                     }
                 },
                 {
-<<<<<<< HEAD
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
-=======
-                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
->>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
-                        "startOffsets": "739,1047",
+                        "startOffsets": "758,1073",
                         "endLines": "24,29",
                         "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "endOffsets": "1065,1191"
                     },
                     "to": {
                         "startLines": "2,8",
@@ -144,31 +171,24 @@
                     }
                 },
                 {
-<<<<<<< HEAD
-                    "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.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"
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "730",
+                        "endColumns": "56",
+                        "endOffsets": "782"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
                     }
                 },
                 {
-                    "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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+                    "source": "D:\\gitProject\\src\\Notes-master3\\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",
@@ -185,30 +205,9 @@
                         "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": "D:\\study\\rjgc\\wrok\\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": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
-                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
-                    },
-                    "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
-                    }
-                },
-                {
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
                         "startLines": "19,20,21,22,18",
                         "startColumns": "4,4,4,4,4",
@@ -223,65 +222,14 @@
                         "endColumns": "51,52,52,51,51",
                         "endOffsets": "524,577,630,682,734"
                     }
-                },
-                {
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
-                    "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "758,1073",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1065,1191"
-                    },
-                    "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "105,300",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "295,415"
-                    }
->>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                 }
             ]
         },
         {
-            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
+            "outputFile": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat",
             "map": [
                 {
-<<<<<<< HEAD
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
-=======
-<<<<<<< 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",
-                        "startOffsets": "712",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "817"
-                    },
-                    "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
-                    }
-                },
-                {
-<<<<<<< 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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+                    "source": "D:\\gitProject\\src\\Notes-master3\\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",
@@ -300,7 +248,7 @@
                     }
                 },
                 {
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index 590e7da..4d128fe 100644
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -1,25 +1,53 @@
 {
     "logs": [
         {
-            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
+            "outputFile": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml",
             "map": [
                 {
-<<<<<<< HEAD
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-=======
-<<<<<<< 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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
-                        "startLines": "18",
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "2",
                         "startColumns": "4",
-                        "startOffsets": "730",
-                        "endLines": "21",
+                        "startOffsets": "105",
+                        "endLines": "5",
                         "endColumns": "19",
-                        "endOffsets": "838"
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\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,121,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6653,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,39,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6688,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "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,107",
+                        "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",
+                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2104,2147,2200,2243,2294,2344,2404,2457,2508,2554,2602,2650,2696,2743,2793,2838,2897,2949,3001,3044,3091,3147,3202,3257,3301,3343,3384,3434,3493,3544,3593,3642,3689,3736,3783,3828,3879,3932,4007,4066,4123,4197,4261,4330,4408,4518,4622,4695,4761,4816,4881,4946,4995,5078,5156,5194,5239,5287,5349,5406,5461,5520,5587,5645,5707,5755,5800,5848,5899,5965",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
+                        "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,39,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,2099,2142,2195,2238,2289,2339,2399,2452,2503,2549,2597,2645,2691,2738,2788,2833,2892,2944,2996,3039,3086,3142,3197,3252,3296,3338,3379,3429,3488,3539,3588,3637,3684,3731,3778,3823,3874,3927,4002,4061,4118,4192,4256,4325,4403,4513,4617,4690,4756,4811,4876,4941,4990,5073,5151,5189,5234,5282,5344,5401,5456,5515,5582,5640,5702,5750,5795,5843,5894,5960,6026"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
+            "map": [
+                {
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "2",
@@ -31,22 +59,11 @@
                     }
                 },
                 {
-<<<<<<< HEAD
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-=======
-<<<<<<< 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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+                    "source": "D:\\gitProject\\src\\Notes-master3\\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"
+                        "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",
+                        "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",
+                        "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"
                     },
                     "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",
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index 5259af8..4007dfe 100644
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -4,38 +4,7 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
             "map": [
                 {
-<<<<<<< HEAD
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
-=======
-<<<<<<< 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",
-                        "startOffsets": "712",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "817"
-                    },
-                    "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
-                    }
-                },
-                {
-<<<<<<< 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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+                    "source": "D:\\gitProject\\src\\Notes-master3\\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",
@@ -54,7 +23,7 @@
                     }
                 },
                 {
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index 7a1b44b..0e6f568 100644
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -4,17 +4,43 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
             "map": [
                 {
-<<<<<<< HEAD
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
-=======
-<<<<<<< HEAD
-                    "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endColumns": "56",
-                        "endOffsets": "764"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "131,135,139,143,146,150,154,158,162,166,170",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8396,8600,8811,9018,9178,9361,9546,9731,9934,10140,10323",
+                        "endLines": "134,138,142,145,149,153,157,161,165,169,173",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8595,8806,9013,9173,9356,9541,9726,9929,10135,10318,10519"
+                    }
+                },
+                {
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                     },
                     "to": {
                         "startLines": "12",
@@ -25,13 +51,30 @@
                     }
                 },
                 {
-                    "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.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"
+                        "startLines": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8414,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8123,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8822,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8160,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "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,125,126,127,128,129,130",
+                        "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,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1136,1232,1315,1411,1480,1530,1573,1625,1677,1726,1789,1831,1889,1940,2024,2118,2226,2297,2381,2464,2530,2613,2715,2776,2838,2889,2967,3020,3080,3185,3244,3346,3401,3472,3516,3565,3623,3670,3729,3786,3857,3918,3975,4025,4077,4130,4180,4230,4290,4343,4409,4471,4534,4581,4636,4724,4782,4844,4894,4939,4982,5042,5109,5164,5219,5272,5319,5372,5428,5476,5531,5584,5668,5735,5799,5895,5969,6050,6139,6302,6446,6525,6600,6682,6741,6821,6901,6956,7078,7181,7233,7286,7327,7380,7437,7511,7576,7644,7730,7810,7866,7960,8019,8074,8136,8196,8306",
+                        "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,125,126,127,128,129,130",
+                        "endColumns": "14,43,95,82,95,68,49,42,51,51,48,62,41,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,43,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,51,52,40,52,56,73,64,67,85,79,55,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1131,1227,1310,1406,1475,1525,1568,1620,1672,1721,1784,1826,1884,1935,2019,2113,2221,2292,2376,2459,2525,2608,2710,2771,2833,2884,2962,3015,3075,3180,3239,3341,3396,3467,3511,3560,3618,3665,3724,3781,3852,3913,3970,4020,4072,4125,4175,4225,4285,4338,4404,4466,4529,4576,4631,4719,4777,4839,4889,4934,4977,5037,5104,5159,5214,5267,5314,5367,5423,5471,5526,5579,5663,5730,5794,5890,5964,6045,6134,6297,6441,6520,6595,6677,6736,6816,6896,6951,7073,7176,7228,7281,7322,7375,7432,7506,7571,7639,7725,7805,7861,7955,8014,8069,8131,8191,8301,8391"
+                    }
+                },
+                {
+                    "source": "D:\\gitProject\\src\\Notes-master3\\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",
@@ -40,40 +83,40 @@
                         "endColumns": "51,52,52,51,51",
                         "endOffsets": "524,577,630,682,734"
                     }
-                },
+                }
+            ]
+        },
+        {
+            "outputFile": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml",
+            "map": [
                 {
-                    "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",
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "730",
-                        "endColumns": "56",
-                        "endOffsets": "782"
+                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
+                        "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"
                     }
                 },
                 {
-<<<<<<< HEAD
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
-=======
-                    "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
->>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
-                        "startOffsets": "739,1047",
+                        "startOffsets": "758,1073",
                         "endLines": "24,29",
                         "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "endOffsets": "1065,1191"
                     },
                     "to": {
                         "startLines": "2,8",
@@ -85,31 +128,24 @@
                     }
                 },
                 {
-<<<<<<< HEAD
-                    "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.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"
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "730",
+                        "endColumns": "56",
+                        "endOffsets": "782"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
                     }
                 },
                 {
-                    "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
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+                    "source": "D:\\gitProject\\src\\Notes-master3\\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",
@@ -126,30 +162,9 @@
                         "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": "D:\\study\\rjgc\\wrok\\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": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
-                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104"
-                    },
-                    "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
-                    }
                 },
                 {
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
+                    "source": "D:\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
                         "startLines": "19,20,21,22,18",
                         "startColumns": "4,4,4,4,4",
@@ -164,26 +179,6 @@
                         "endColumns": "51,52,52,51,51",
                         "endOffsets": "524,577,630,682,734"
                     }
-                },
-                {
-                    "source": "D:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
-                    "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "758,1073",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1065,1191"
-                    },
-                    "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "105,300",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "295,415"
-                    }
->>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                 }
             ]
         }
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index 2a106a9..95b5013 100644
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -1,382 +1,386 @@
 [
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_item.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/settings_header.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat",
-        "source": "net.micode.notes.app-main-7:/raw/introduction"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat",
-        "source": "net.micode.notes.app-main-7:/drawable/new_note.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat",
-        "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat",
-        "source": "net.micode.notes.app-main-7:/xml/preferences.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat",
-        "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat",
-        "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat",
-        "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat",
-        "source": "net.micode.notes.app-main-7:/xml/searchable.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_list.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/note_list.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat",
-        "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/note_edit.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png"
+        "merged": "net.micode.notes.app-merged_res-5:/layout_activity_login.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/activity_login.xml"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png"
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png"
+    },
+    {
+        "merged": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat",
+        "source": "C:\\Users\\王俊龙\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png"
     }
 ]
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
index 4ce9215..868e626 100644
--- a/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@@ -36,7 +36,28 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
+        <activity
+            android:name="net.micode.notes.ui.LoginActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/NoteTheme" >
+
+            <!--
+        android:configChanges="keyboardHidden|orientation|screenSize"
+        android:exported="true"
+        android:launchMode="singleTop"
+        android:theme="@style/NoteTheme"
+        android:uiOptions="splitActionBarWhenNarrow"
+        android:windowSoftInputMode="adjustPan">
+            -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index e48d592..ae9fbc5 100644
Binary files a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar
deleted file mode 100644
index 90fedfb..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
index cacd9ba..cc97ecc 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
index 79a4ac6..acbf509 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
index 2b85968..b0f514e 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
index 7f9fa34..43553a3 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index c1b64ec..fc3a325 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
index d79f719..b377884 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
index 5f69d8d..bd1f5ea 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index dca62bf..fcc2380 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
index d339f97..8608dc5 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index 14c1054..93a92f1 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
index c94758c..52e7c79 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index 0ab3929..df9ff18 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index 77e20f3..ea9f7de 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index b8b111d..2425b03 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index 92c61e8..11475cb 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
index 6120b31..90e4b44 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
index 1cec24d..322e4fa 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
index c3a81d6..4ec4c58 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
index 6252d17..005f013 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
index c5b1a58..bfa28f2 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
index 5ec3825..f309069 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
index aaf7e5c..c78d2e5 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
index effaab0..804791a 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
index 73f6100..7aa9d66 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
index 00d6e91..b740e28 100644
--- a/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -74,87 +74,92 @@ int drawable widget_4x_green 0x7f04003e
 int drawable widget_4x_red 0x7f04003f
 int drawable widget_4x_white 0x7f040040
 int drawable widget_4x_yellow 0x7f040041
-int id account_dialog_subtitle 0x7f050000
-int id account_dialog_title 0x7f050001
-int id action_select_all 0x7f050002
-int id amPm 0x7f050003
-int id btn_new_note 0x7f050004
-int id btn_set_bg_color 0x7f050005
-int id cb_edit_item 0x7f050006
-int id date 0x7f050007
-int id delete 0x7f050008
-int id et_edit_text 0x7f050009
-int id et_foler_name 0x7f05000a
-int id font_size_selector 0x7f05000b
-int id hour 0x7f05000c
-int id iv_alert_icon 0x7f05000d
-int id iv_bg_blue 0x7f05000e
-int id iv_bg_blue_select 0x7f05000f
-int id iv_bg_green 0x7f050010
-int id iv_bg_green_select 0x7f050011
-int id iv_bg_red 0x7f050012
-int id iv_bg_red_select 0x7f050013
-int id iv_bg_white 0x7f050014
-int id iv_bg_white_select 0x7f050015
-int id iv_bg_yellow 0x7f050016
-int id iv_bg_yellow_select 0x7f050017
-int id iv_large_select 0x7f050018
-int id iv_medium_select 0x7f050019
-int id iv_small_select 0x7f05001a
-int id iv_super_select 0x7f05001b
-int id ll_font_large 0x7f05001c
-int id ll_font_normal 0x7f05001d
-int id ll_font_small 0x7f05001e
-int id ll_font_super 0x7f05001f
-int id menu_alert 0x7f050020
-int id menu_delete 0x7f050021
-int id menu_delete_remind 0x7f050022
-int id menu_export_text 0x7f050023
-int id menu_font_size 0x7f050024
-int id menu_list_mode 0x7f050025
-int id menu_new_folder 0x7f050026
-int id menu_new_note 0x7f050027
-int id menu_search 0x7f050028
-int id menu_send_to_desktop 0x7f050029
-int id menu_setting 0x7f05002a
-int id menu_share 0x7f05002b
-int id menu_sync 0x7f05002c
-int id minute 0x7f05002d
-int id move 0x7f05002e
-int id navigation_bar 0x7f05002f
-int id note_bg_color_selector 0x7f050030
-int id note_edit_list 0x7f050031
-int id note_edit_view 0x7f050032
-int id note_item 0x7f050033
-int id note_title 0x7f050034
-int id notes_list 0x7f050035
-int id prefenerece_sync_status_textview 0x7f050036
-int id preference_sync_button 0x7f050037
-int id selection_menu 0x7f050038
-int id sv_note_edit 0x7f050039
-int id tv_alert_date 0x7f05003a
-int id tv_folder_name 0x7f05003b
-int id tv_modified_date 0x7f05003c
-int id tv_name 0x7f05003d
-int id tv_time 0x7f05003e
-int id tv_title 0x7f05003f
-int id tv_title_bar 0x7f050040
-int id widget_bg_image 0x7f050041
-int id widget_text 0x7f050042
+int id account 0x7f050000
+int id account_dialog_subtitle 0x7f050001
+int id account_dialog_title 0x7f050002
+int id action_select_all 0x7f050003
+int id amPm 0x7f050004
+int id btn_new_note 0x7f050005
+int id btn_set_bg_color 0x7f050006
+int id cancel 0x7f050007
+int id cb_edit_item 0x7f050008
+int id date 0x7f050009
+int id delete 0x7f05000a
+int id et_edit_text 0x7f05000b
+int id et_foler_name 0x7f05000c
+int id font_size_selector 0x7f05000d
+int id hour 0x7f05000e
+int id iv_alert_icon 0x7f05000f
+int id iv_bg_blue 0x7f050010
+int id iv_bg_blue_select 0x7f050011
+int id iv_bg_green 0x7f050012
+int id iv_bg_green_select 0x7f050013
+int id iv_bg_red 0x7f050014
+int id iv_bg_red_select 0x7f050015
+int id iv_bg_white 0x7f050016
+int id iv_bg_white_select 0x7f050017
+int id iv_bg_yellow 0x7f050018
+int id iv_bg_yellow_select 0x7f050019
+int id iv_large_select 0x7f05001a
+int id iv_medium_select 0x7f05001b
+int id iv_small_select 0x7f05001c
+int id iv_super_select 0x7f05001d
+int id ll_font_large 0x7f05001e
+int id ll_font_normal 0x7f05001f
+int id ll_font_small 0x7f050020
+int id ll_font_super 0x7f050021
+int id login 0x7f050022
+int id menu_alert 0x7f050023
+int id menu_delete 0x7f050024
+int id menu_delete_remind 0x7f050025
+int id menu_export_text 0x7f050026
+int id menu_font_size 0x7f050027
+int id menu_list_mode 0x7f050028
+int id menu_new_folder 0x7f050029
+int id menu_new_note 0x7f05002a
+int id menu_search 0x7f05002b
+int id menu_send_to_desktop 0x7f05002c
+int id menu_setting 0x7f05002d
+int id menu_share 0x7f05002e
+int id menu_sync 0x7f05002f
+int id minute 0x7f050030
+int id move 0x7f050031
+int id navigation_bar 0x7f050032
+int id note_bg_color_selector 0x7f050033
+int id note_edit_list 0x7f050034
+int id note_edit_view 0x7f050035
+int id note_item 0x7f050036
+int id note_title 0x7f050037
+int id notes_list 0x7f050038
+int id password 0x7f050039
+int id prefenerece_sync_status_textview 0x7f05003a
+int id preference_sync_button 0x7f05003b
+int id selection_menu 0x7f05003c
+int id sv_note_edit 0x7f05003d
+int id tv_alert_date 0x7f05003e
+int id tv_folder_name 0x7f05003f
+int id tv_modified_date 0x7f050040
+int id tv_name 0x7f050041
+int id tv_time 0x7f050042
+int id tv_title 0x7f050043
+int id tv_title_bar 0x7f050044
+int id widget_bg_image 0x7f050045
+int id widget_text 0x7f050046
 int layout account_dialog_title 0x7f060000
-int layout add_account_text 0x7f060001
-int layout datetime_picker 0x7f060002
-int layout dialog_edit_text 0x7f060003
-int layout folder_list_item 0x7f060004
-int layout note_edit 0x7f060005
-int layout note_edit_list_item 0x7f060006
-int layout note_item 0x7f060007
-int layout note_list 0x7f060008
-int layout note_list_dropdown_menu 0x7f060009
-int layout note_list_footer 0x7f06000a
-int layout settings_header 0x7f06000b
-int layout widget_2x 0x7f06000c
-int layout widget_4x 0x7f06000d
+int layout activity_login 0x7f060001
+int layout add_account_text 0x7f060002
+int layout datetime_picker 0x7f060003
+int layout dialog_edit_text 0x7f060004
+int layout folder_list_item 0x7f060005
+int layout note_edit 0x7f060006
+int layout note_edit_list_item 0x7f060007
+int layout note_item 0x7f060008
+int layout note_list 0x7f060009
+int layout note_list_dropdown_menu 0x7f06000a
+int layout note_list_footer 0x7f06000b
+int layout settings_header 0x7f06000c
+int layout widget_2x 0x7f06000d
+int layout widget_4x 0x7f06000e
 int menu call_note_edit 0x7f070000
 int menu call_record_folder 0x7f070001
 int menu note_edit 0x7f070002
@@ -164,108 +169,114 @@ int menu note_list_options 0x7f070005
 int menu sub_folder 0x7f070006
 int plurals search_results_title 0x7f080000
 int raw introduction 0x7f090000
-int string alert_message_delete_folder 0x7f0a0000
-int string alert_message_delete_note 0x7f0a0001
-int string alert_message_delete_notes 0x7f0a0002
-int string alert_title_delete 0x7f0a0003
-int string app_name 0x7f0a0004
-int string app_widget2x2 0x7f0a0005
-int string app_widget4x4 0x7f0a0006
-int string button_delete 0x7f0a0007
-int string call_record_folder_name 0x7f0a0008
-int string datetime_dialog_cancel 0x7f0a0009
-int string datetime_dialog_ok 0x7f0a000a
-int string delete_remind_time_message 0x7f0a000b
-int string error_note_empty_for_clock 0x7f0a000c
-int string error_note_empty_for_send_to_desktop 0x7f0a000d
-int string error_note_not_exist 0x7f0a000e
-int string error_sdcard_export 0x7f0a000f
-int string error_sdcard_unmounted 0x7f0a0010
-int string error_sync_cancelled 0x7f0a0011
-int string error_sync_internal 0x7f0a0012
-int string error_sync_network 0x7f0a0013
-int string failed_sdcard_export 0x7f0a0014
-int string file_name_txt_format 0x7f0a0015
-int string file_path 0x7f0a0016
-int string folder_exist 0x7f0a0017
-int string format_date_ymd 0x7f0a0018
-int string format_datetime_mdhm 0x7f0a0019
-int string format_exported_file_location 0x7f0a001a
-int string format_folder_files_count 0x7f0a001b
-int string format_move_notes_to_folder 0x7f0a001c
-int string hint_foler_name 0x7f0a001d
-int string info_note_enter_desktop 0x7f0a001e
-int string menu_alert 0x7f0a001f
-int string menu_create_folder 0x7f0a0020
-int string menu_delete 0x7f0a0021
-int string menu_deselect_all 0x7f0a0022
-int string menu_export_text 0x7f0a0023
-int string menu_folder_change_name 0x7f0a0024
-int string menu_folder_delete 0x7f0a0025
-int string menu_folder_view 0x7f0a0026
-int string menu_font_large 0x7f0a0027
-int string menu_font_normal 0x7f0a0028
-int string menu_font_size 0x7f0a0029
-int string menu_font_small 0x7f0a002a
-int string menu_font_super 0x7f0a002b
-int string menu_list_mode 0x7f0a002c
-int string menu_move 0x7f0a002d
-int string menu_move_parent_folder 0x7f0a002e
-int string menu_normal_mode 0x7f0a002f
-int string menu_remove_remind 0x7f0a0030
-int string menu_search 0x7f0a0031
-int string menu_select_all 0x7f0a0032
-int string menu_select_none 0x7f0a0033
-int string menu_select_title 0x7f0a0034
-int string menu_send_to_desktop 0x7f0a0035
-int string menu_setting 0x7f0a0036
-int string menu_share 0x7f0a0037
-int string menu_sync 0x7f0a0038
-int string menu_sync_cancel 0x7f0a0039
-int string menu_title_select_folder 0x7f0a003a
-int string note_alert_expired 0x7f0a003b
-int string note_link_email 0x7f0a003c
-int string note_link_other 0x7f0a003d
-int string note_link_tel 0x7f0a003e
-int string note_link_web 0x7f0a003f
-int string notealert_enter 0x7f0a0040
-int string notealert_ok 0x7f0a0041
-int string notelist_menu_new 0x7f0a0042
-int string notelist_string_info 0x7f0a0043
-int string preferences_account_summary 0x7f0a0044
-int string preferences_account_title 0x7f0a0045
-int string preferences_add_account 0x7f0a0046
-int string preferences_bg_random_appear_title 0x7f0a0047
-int string preferences_button_sync_cancel 0x7f0a0048
-int string preferences_button_sync_immediately 0x7f0a0049
-int string preferences_dialog_change_account_title 0x7f0a004a
-int string preferences_dialog_change_account_warn_msg 0x7f0a004b
-int string preferences_dialog_select_account_tips 0x7f0a004c
-int string preferences_dialog_select_account_title 0x7f0a004d
-int string preferences_last_sync_time 0x7f0a004e
-int string preferences_last_sync_time_format 0x7f0a004f
-int string preferences_menu_cancel 0x7f0a0050
-int string preferences_menu_change_account 0x7f0a0051
-int string preferences_menu_remove_account 0x7f0a0052
-int string preferences_title 0x7f0a0053
-int string preferences_toast_cannot_change_account 0x7f0a0054
-int string preferences_toast_success_set_accout 0x7f0a0055
-int string search 0x7f0a0056
-int string search_hint 0x7f0a0057
-int string search_label 0x7f0a0058
-int string search_setting_description 0x7f0a0059
-int string set_remind_time_message 0x7f0a005a
-int string success_sdcard_export 0x7f0a005b
-int string success_sync_account 0x7f0a005c
-int string sync_progress_init_list 0x7f0a005d
-int string sync_progress_login 0x7f0a005e
-int string sync_progress_syncing 0x7f0a005f
-int string ticker_cancel 0x7f0a0060
-int string ticker_fail 0x7f0a0061
-int string ticker_success 0x7f0a0062
-int string ticker_syncing 0x7f0a0063
-int string widget_havenot_content 0x7f0a0064
-int string widget_under_visit_mode 0x7f0a0065
+int string Loading 0x7f0a0000
+int string alert_message_delete_folder 0x7f0a0001
+int string alert_message_delete_note 0x7f0a0002
+int string alert_message_delete_notes 0x7f0a0003
+int string alert_title_delete 0x7f0a0004
+int string app_already_quit 0x7f0a0005
+int string app_name 0x7f0a0006
+int string app_widget2x2 0x7f0a0007
+int string app_widget4x4 0x7f0a0008
+int string button_delete 0x7f0a0009
+int string call_record_folder_name 0x7f0a000a
+int string cancel 0x7f0a000b
+int string datetime_dialog_cancel 0x7f0a000c
+int string datetime_dialog_ok 0x7f0a000d
+int string delete_remind_time_message 0x7f0a000e
+int string error_note_empty_for_clock 0x7f0a000f
+int string error_note_empty_for_send_to_desktop 0x7f0a0010
+int string error_note_not_exist 0x7f0a0011
+int string error_sdcard_export 0x7f0a0012
+int string error_sdcard_unmounted 0x7f0a0013
+int string error_sync_cancelled 0x7f0a0014
+int string error_sync_internal 0x7f0a0015
+int string error_sync_network 0x7f0a0016
+int string failed_sdcard_export 0x7f0a0017
+int string file_name_txt_format 0x7f0a0018
+int string file_path 0x7f0a0019
+int string folder_exist 0x7f0a001a
+int string format_date_ymd 0x7f0a001b
+int string format_datetime_mdhm 0x7f0a001c
+int string format_exported_file_location 0x7f0a001d
+int string format_folder_files_count 0x7f0a001e
+int string format_move_notes_to_folder 0x7f0a001f
+int string hint_foler_name 0x7f0a0020
+int string info_note_enter_desktop 0x7f0a0021
+int string invalid 0x7f0a0022
+int string menu_alert 0x7f0a0023
+int string menu_create_folder 0x7f0a0024
+int string menu_delete 0x7f0a0025
+int string menu_deselect_all 0x7f0a0026
+int string menu_export_text 0x7f0a0027
+int string menu_folder_change_name 0x7f0a0028
+int string menu_folder_delete 0x7f0a0029
+int string menu_folder_view 0x7f0a002a
+int string menu_font_large 0x7f0a002b
+int string menu_font_normal 0x7f0a002c
+int string menu_font_size 0x7f0a002d
+int string menu_font_small 0x7f0a002e
+int string menu_font_super 0x7f0a002f
+int string menu_list_mode 0x7f0a0030
+int string menu_move 0x7f0a0031
+int string menu_move_parent_folder 0x7f0a0032
+int string menu_normal_mode 0x7f0a0033
+int string menu_remove_remind 0x7f0a0034
+int string menu_search 0x7f0a0035
+int string menu_select_all 0x7f0a0036
+int string menu_select_none 0x7f0a0037
+int string menu_select_title 0x7f0a0038
+int string menu_send_to_desktop 0x7f0a0039
+int string menu_setting 0x7f0a003a
+int string menu_share 0x7f0a003b
+int string menu_sync 0x7f0a003c
+int string menu_sync_cancel 0x7f0a003d
+int string menu_title_select_folder 0x7f0a003e
+int string note_alert_expired 0x7f0a003f
+int string note_link_email 0x7f0a0040
+int string note_link_other 0x7f0a0041
+int string note_link_tel 0x7f0a0042
+int string note_link_web 0x7f0a0043
+int string notealert_enter 0x7f0a0044
+int string notealert_ok 0x7f0a0045
+int string notelist_menu_new 0x7f0a0046
+int string notelist_string_info 0x7f0a0047
+int string preferences_account_summary 0x7f0a0048
+int string preferences_account_title 0x7f0a0049
+int string preferences_add_account 0x7f0a004a
+int string preferences_bg_random_appear_title 0x7f0a004b
+int string preferences_button_sync_cancel 0x7f0a004c
+int string preferences_button_sync_immediately 0x7f0a004d
+int string preferences_dialog_change_account_title 0x7f0a004e
+int string preferences_dialog_change_account_warn_msg 0x7f0a004f
+int string preferences_dialog_select_account_tips 0x7f0a0050
+int string preferences_dialog_select_account_title 0x7f0a0051
+int string preferences_last_sync_time 0x7f0a0052
+int string preferences_last_sync_time_format 0x7f0a0053
+int string preferences_menu_cancel 0x7f0a0054
+int string preferences_menu_change_account 0x7f0a0055
+int string preferences_menu_remove_account 0x7f0a0056
+int string preferences_title 0x7f0a0057
+int string preferences_toast_cannot_change_account 0x7f0a0058
+int string preferences_toast_success_set_accout 0x7f0a0059
+int string prompt_account 0x7f0a005a
+int string prompt_password 0x7f0a005b
+int string search 0x7f0a005c
+int string search_hint 0x7f0a005d
+int string search_label 0x7f0a005e
+int string search_setting_description 0x7f0a005f
+int string set_remind_time_message 0x7f0a0060
+int string success_sdcard_export 0x7f0a0061
+int string success_sync_account 0x7f0a0062
+int string sync_progress_init_list 0x7f0a0063
+int string sync_progress_login 0x7f0a0064
+int string sync_progress_syncing 0x7f0a0065
+int string ticker_cancel 0x7f0a0066
+int string ticker_fail 0x7f0a0067
+int string ticker_success 0x7f0a0068
+int string ticker_syncing 0x7f0a0069
+int string widget_havenot_content 0x7f0a006a
+int string widget_under_visit_mode 0x7f0a006b
 int style HighlightTextAppearancePrimary 0x7f0b0000
 int style HighlightTextAppearanceSecondary 0x7f0b0001
 int style NoteActionBarStyle 0x7f0b0002
diff --git a/src/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
index bb4deaa..1920ca8 100644
--- a/src/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
+++ b/src/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
@@ -1 +1 @@
-{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
\ No newline at end of file
+{"enableV1Signing":true,"enableV2Signing":false,"enableV3Signing":false,"enableV4Signing":false}
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
index ca64e25..4e45eb9 100644
--- a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
+++ b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
@@ -1,30 +1,8 @@
-<<<<<<< HEAD
-net.micode.notes.app-pngs-0 D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug
-net.micode.notes.app-rs-2 D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\build\generated\res\rs\debug
-net.micode.notes.app-mergeDebugResources-3 D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
-net.micode.notes.app-mergeDebugResources-4 D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
-net.micode.notes.app-merged_res-5 D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-6 D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\debug\res
-net.micode.notes.app-main-7 D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\res
-=======
-<<<<<<< HEAD
-net.micode.notes.app-pngs-0 D:\Notes-master3\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 D:\Notes-master3\app\build\generated\res\resValues\debug
-net.micode.notes.app-rs-2 D:\Notes-master3\app\build\generated\res\rs\debug
-net.micode.notes.app-mergeDebugResources-3 D:\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
-net.micode.notes.app-mergeDebugResources-4 D:\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
-net.micode.notes.app-merged_res-5 D:\Notes-master3\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-6 D:\Notes-master3\app\src\debug\res
-net.micode.notes.app-main-7 D:\Notes-master3\app\src\main\res
-=======
-net.micode.notes.app-pngs-0 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug
-net.micode.notes.app-rs-2 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\rs\debug
-net.micode.notes.app-mergeDebugResources-3 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
-net.micode.notes.app-mergeDebugResources-4 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
-net.micode.notes.app-merged_res-5 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-6 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\res
-net.micode.notes.app-main-7 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res
->>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+net.micode.notes.app-pngs-0 D:\gitProject\src\Notes-master3\app\build\generated\res\pngs\debug
+net.micode.notes.app-resValues-1 D:\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug
+net.micode.notes.app-rs-2 D:\gitProject\src\Notes-master3\app\build\generated\res\rs\debug
+net.micode.notes.app-mergeDebugResources-3 D:\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
+net.micode.notes.app-mergeDebugResources-4 D:\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
+net.micode.notes.app-merged_res-5 D:\gitProject\src\Notes-master3\app\build\intermediates\merged_res\debug
+net.micode.notes.app-debug-6 D:\gitProject\src\Notes-master3\app\src\debug\res
+net.micode.notes.app-main-7 D:\gitProject\src\Notes-master3\app\src\main\res
diff --git a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index 4461006..30360ba 100644
--- a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -4,76 +4,83 @@ net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
 net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
-net.micode.notes:string/widget_havenot_content = 0x7f0a0064
-net.micode.notes:string/ticker_syncing = 0x7f0a0063
-net.micode.notes:string/ticker_success = 0x7f0a0062
+net.micode.notes:string/widget_havenot_content = 0x7f0a006a
+net.micode.notes:string/ticker_syncing = 0x7f0a0069
+net.micode.notes:string/ticker_success = 0x7f0a0068
 net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
-net.micode.notes:string/ticker_cancel = 0x7f0a0060
-net.micode.notes:string/sync_progress_syncing = 0x7f0a005f
-net.micode.notes:string/sync_progress_init_list = 0x7f0a005d
-net.micode.notes:string/search_label = 0x7f0a0058
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
-net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
-net.micode.notes:string/preferences_title = 0x7f0a0053
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
+net.micode.notes:string/ticker_cancel = 0x7f0a0066
+net.micode.notes:string/sync_progress_syncing = 0x7f0a0065
+net.micode.notes:string/sync_progress_init_list = 0x7f0a0063
+net.micode.notes:string/search_label = 0x7f0a005e
+net.micode.notes:string/prompt_password = 0x7f0a005b
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0059
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0058
+net.micode.notes:string/preferences_title = 0x7f0a0057
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0056
 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
-net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
-net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050
-net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
-net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
-net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
-net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048
-net.micode.notes:string/preferences_account_summary = 0x7f0a0044
-net.micode.notes:string/success_sdcard_export = 0x7f0a005b
-net.micode.notes:string/notelist_string_info = 0x7f0a0043
-net.micode.notes:string/notelist_menu_new = 0x7f0a0042
-net.micode.notes:string/notealert_ok = 0x7f0a0041
-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/note_link_other = 0x7f0a003d
-net.micode.notes:string/note_link_email = 0x7f0a003c
-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:string/menu_share = 0x7f0a0037
-net.micode.notes:string/menu_select_title = 0x7f0a0034
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0055
+net.micode.notes:string/preferences_menu_cancel = 0x7f0a0054
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a0052
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0051
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004f
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004d
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004c
+net.micode.notes:string/preferences_account_summary = 0x7f0a0048
+net.micode.notes:string/success_sdcard_export = 0x7f0a0061
+net.micode.notes:string/notelist_string_info = 0x7f0a0047
+net.micode.notes:string/prompt_account = 0x7f0a005a
+net.micode.notes:string/notelist_menu_new = 0x7f0a0046
+net.micode.notes:string/notealert_ok = 0x7f0a0045
+net.micode.notes:string/notealert_enter = 0x7f0a0044
+net.micode.notes:string/note_link_tel = 0x7f0a0042
+net.micode.notes:string/note_link_other = 0x7f0a0041
+net.micode.notes:string/note_link_email = 0x7f0a0040
+net.micode.notes:string/note_alert_expired = 0x7f0a003f
+net.micode.notes:string/menu_sync_cancel = 0x7f0a003d
+net.micode.notes:string/menu_share = 0x7f0a003b
+net.micode.notes:string/menu_select_title = 0x7f0a0038
 net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
-net.micode.notes:string/menu_select_none = 0x7f0a0033
-net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
-net.micode.notes:string/menu_select_all = 0x7f0a0032
-net.micode.notes:string/menu_search = 0x7f0a0031
-net.micode.notes:string/menu_remove_remind = 0x7f0a0030
-net.micode.notes:string/menu_normal_mode = 0x7f0a002f
-net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
-net.micode.notes:string/menu_move = 0x7f0a002d
-net.micode.notes:string/menu_list_mode = 0x7f0a002c
-net.micode.notes:string/menu_font_super = 0x7f0a002b
-net.micode.notes:string/menu_font_small = 0x7f0a002a
-net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
-net.micode.notes:string/menu_export_text = 0x7f0a0023
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
-net.micode.notes:string/menu_create_folder = 0x7f0a0020
+net.micode.notes:string/menu_select_none = 0x7f0a0037
+net.micode.notes:string/menu_title_select_folder = 0x7f0a003e
+net.micode.notes:string/menu_select_all = 0x7f0a0036
+net.micode.notes:string/menu_search = 0x7f0a0035
+net.micode.notes:string/menu_remove_remind = 0x7f0a0034
+net.micode.notes:string/menu_normal_mode = 0x7f0a0033
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a0032
+net.micode.notes:string/menu_move = 0x7f0a0031
+net.micode.notes:string/menu_list_mode = 0x7f0a0030
+net.micode.notes:string/menu_font_super = 0x7f0a002f
+net.micode.notes:string/menu_font_small = 0x7f0a002e
+net.micode.notes:string/menu_folder_change_name = 0x7f0a0028
+net.micode.notes:string/menu_export_text = 0x7f0a0027
+net.micode.notes:string/menu_deselect_all = 0x7f0a0026
+net.micode.notes:string/menu_create_folder = 0x7f0a0024
+net.micode.notes:string/invalid = 0x7f0a0022
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a0021
+net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001f
+net.micode.notes:string/format_folder_files_count = 0x7f0a001e
+net.micode.notes:string/format_datetime_mdhm = 0x7f0a001c
+net.micode.notes:string/format_date_ymd = 0x7f0a001b
 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
-net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:string/hint_foler_name = 0x7f0a001d
-net.micode.notes:string/format_date_ymd = 0x7f0a0018
-net.micode.notes:string/file_path = 0x7f0a0016
-net.micode.notes:string/set_remind_time_message = 0x7f0a005a
-net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
-net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
+net.micode.notes:string/hint_foler_name = 0x7f0a0020
+net.micode.notes:string/folder_exist = 0x7f0a001a
+net.micode.notes:string/file_path = 0x7f0a0019
+net.micode.notes:string/set_remind_time_message = 0x7f0a0060
+net.micode.notes:string/error_sync_network = 0x7f0a0016
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0013
+net.micode.notes:string/datetime_dialog_ok = 0x7f0a000d
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000c
 net.micode.notes:drawable/list_green_up = 0x7f040020
-net.micode.notes:string/call_record_folder_name = 0x7f0a0008
+net.micode.notes:string/call_record_folder_name = 0x7f0a000a
 net.micode.notes:drawable/new_note_normal = 0x7f040030
-net.micode.notes:string/button_delete = 0x7f0a0007
-net.micode.notes:string/app_widget2x2 = 0x7f0a0005
-net.micode.notes:string/menu_font_normal = 0x7f0a0028
-net.micode.notes:string/format_exported_file_location = 0x7f0a001a
+net.micode.notes:string/button_delete = 0x7f0a0009
+net.micode.notes:string/app_widget2x2 = 0x7f0a0007
+net.micode.notes:string/note_link_web = 0x7f0a0043
+net.micode.notes:string/Loading = 0x7f0a0000
+net.micode.notes:string/menu_font_normal = 0x7f0a002c
+net.micode.notes:string/format_exported_file_location = 0x7f0a001d
 net.micode.notes:raw/introduction = 0x7f090000
-net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000e
 net.micode.notes:dimen/text_font_size_super = 0x7f030004
 net.micode.notes:drawable/selected = 0x7f040035
 net.micode.notes:plurals/search_results_title = 0x7f080000
@@ -81,203 +88,207 @@ net.micode.notes:menu/sub_folder = 0x7f070006
 net.micode.notes:menu/note_edit = 0x7f070002
 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
 net.micode.notes:color/secondary_text_dark = 0x7f020001
-net.micode.notes:id/move = 0x7f05002e
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
+net.micode.notes:id/move = 0x7f050031
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050019
 net.micode.notes:menu/call_note_edit = 0x7f070000
 net.micode.notes:drawable/new_note_pressed = 0x7f040031
-net.micode.notes:id/iv_bg_blue = 0x7f05000e
-net.micode.notes:layout/settings_header = 0x7f06000b
-net.micode.notes:layout/note_list = 0x7f060008
+net.micode.notes:id/iv_bg_blue = 0x7f050010
+net.micode.notes:layout/settings_header = 0x7f06000c
+net.micode.notes:layout/note_list = 0x7f060009
 net.micode.notes:drawable/list_white_single = 0x7f040027
-net.micode.notes:layout/note_item = 0x7f060007
+net.micode.notes:layout/note_item = 0x7f060008
 net.micode.notes:xml/widget_2x_info = 0x7f0c0002
-net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
-net.micode.notes:layout/datetime_picker = 0x7f060002
-net.micode.notes:id/btn_new_note = 0x7f050004
-net.micode.notes:layout/note_list_footer = 0x7f06000a
-net.micode.notes:id/widget_text = 0x7f050042
-net.micode.notes:id/tv_title_bar = 0x7f050040
+net.micode.notes:string/alert_message_delete_folder = 0x7f0a0001
+net.micode.notes:layout/datetime_picker = 0x7f060003
+net.micode.notes:id/btn_new_note = 0x7f050005
+net.micode.notes:layout/note_list_footer = 0x7f06000b
+net.micode.notes:id/widget_text = 0x7f050046
+net.micode.notes:id/tv_title_bar = 0x7f050044
 net.micode.notes:drawable/widget_2x_blue = 0x7f040038
-net.micode.notes:id/tv_time = 0x7f05003e
-net.micode.notes:id/tv_name = 0x7f05003d
+net.micode.notes:id/tv_time = 0x7f050042
+net.micode.notes:id/tv_name = 0x7f050041
 net.micode.notes:drawable/new_note = 0x7f04002f
-net.micode.notes:id/sv_note_edit = 0x7f050039
-net.micode.notes:id/selection_menu = 0x7f050038
-net.micode.notes:string/error_sdcard_export = 0x7f0a000f
-net.micode.notes:id/preference_sync_button = 0x7f050037
-net.micode.notes:layout/note_edit = 0x7f060005
-net.micode.notes:id/notes_list = 0x7f050035
-net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
+net.micode.notes:id/sv_note_edit = 0x7f05003d
+net.micode.notes:id/selection_menu = 0x7f05003c
+net.micode.notes:string/error_sdcard_export = 0x7f0a0012
+net.micode.notes:id/preference_sync_button = 0x7f05003b
+net.micode.notes:layout/activity_login = 0x7f060001
+net.micode.notes:id/tv_alert_date = 0x7f05003e
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:id/password = 0x7f050039
+net.micode.notes:layout/note_edit = 0x7f060006
+net.micode.notes:id/notes_list = 0x7f050038
+net.micode.notes:string/alert_message_delete_notes = 0x7f0a0003
 net.micode.notes:drawable/title_alert = 0x7f040036
-net.micode.notes:id/note_title = 0x7f050034
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
-net.micode.notes:id/note_edit_view = 0x7f050032
-net.micode.notes:id/navigation_bar = 0x7f05002f
-net.micode.notes:string/app_widget4x4 = 0x7f0a0006
+net.micode.notes:id/note_title = 0x7f050037
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0053
+net.micode.notes:id/note_edit_view = 0x7f050035
+net.micode.notes:id/navigation_bar = 0x7f050032
+net.micode.notes:string/app_widget4x4 = 0x7f0a0008
 net.micode.notes:drawable/font_normal = 0x7f040011
-net.micode.notes:id/minute = 0x7f05002d
+net.micode.notes:id/minute = 0x7f050030
 net.micode.notes:drawable/font_super = 0x7f040014
-net.micode.notes:id/menu_sync = 0x7f05002c
-net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
-net.micode.notes:id/menu_share = 0x7f05002b
-net.micode.notes:id/menu_setting = 0x7f05002a
-net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
-net.micode.notes:id/menu_send_to_desktop = 0x7f050029
-net.micode.notes:id/menu_search = 0x7f050028
+net.micode.notes:id/menu_sync = 0x7f05002f
+net.micode.notes:id/menu_share = 0x7f05002e
+net.micode.notes:id/menu_setting = 0x7f05002d
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a006b
+net.micode.notes:id/account = 0x7f050000
+net.micode.notes:id/menu_send_to_desktop = 0x7f05002c
+net.micode.notes:id/menu_search = 0x7f05002b
 net.micode.notes:drawable/list_green_down = 0x7f04001d
-net.micode.notes:id/menu_new_note = 0x7f050027
-net.micode.notes:string/error_note_not_exist = 0x7f0a000e
-net.micode.notes:id/menu_new_folder = 0x7f050026
-net.micode.notes:id/menu_list_mode = 0x7f050025
-net.micode.notes:id/iv_medium_select = 0x7f050019
-net.micode.notes:id/menu_export_text = 0x7f050023
-net.micode.notes:string/menu_folder_view = 0x7f0a0026
-net.micode.notes:id/menu_delete = 0x7f050021
-net.micode.notes:string/ticker_fail = 0x7f0a0061
-net.micode.notes:string/file_name_txt_format = 0x7f0a0015
+net.micode.notes:id/menu_new_note = 0x7f05002a
+net.micode.notes:string/error_note_not_exist = 0x7f0a0011
+net.micode.notes:id/menu_new_folder = 0x7f050029
+net.micode.notes:id/menu_list_mode = 0x7f050028
+net.micode.notes:id/iv_medium_select = 0x7f05001b
+net.micode.notes:id/menu_export_text = 0x7f050026
+net.micode.notes:string/menu_folder_view = 0x7f0a002a
+net.micode.notes:id/menu_delete = 0x7f050024
+net.micode.notes:string/ticker_fail = 0x7f0a0067
+net.micode.notes:string/file_name_txt_format = 0x7f0a0018
 net.micode.notes:drawable/edit_blue = 0x7f040006
-net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036
-net.micode.notes:string/menu_font_size = 0x7f0a0029
-net.micode.notes:string/menu_alert = 0x7f0a001f
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f05003a
+net.micode.notes:string/menu_font_size = 0x7f0a002d
+net.micode.notes:string/menu_alert = 0x7f0a0023
 net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
-net.micode.notes:id/menu_alert = 0x7f050020
-net.micode.notes:string/success_sync_account = 0x7f0a005c
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:id/ll_font_small = 0x7f05001e
+net.micode.notes:id/menu_alert = 0x7f050023
+net.micode.notes:id/login = 0x7f050022
+net.micode.notes:string/success_sync_account = 0x7f0a0062
+net.micode.notes:id/ll_font_super = 0x7f050021
+net.micode.notes:id/ll_font_small = 0x7f050020
 net.micode.notes:menu/call_record_folder = 0x7f070001
-net.micode.notes:id/ll_font_normal = 0x7f05001d
-net.micode.notes:id/ll_font_large = 0x7f05001c
-net.micode.notes:id/note_bg_color_selector = 0x7f050030
+net.micode.notes:id/ll_font_normal = 0x7f05001f
+net.micode.notes:id/ll_font_large = 0x7f05001e
+net.micode.notes:id/note_bg_color_selector = 0x7f050033
 net.micode.notes:drawable/search_result = 0x7f040034
-net.micode.notes:id/iv_super_select = 0x7f05001b
-net.micode.notes:id/iv_bg_yellow = 0x7f050016
-net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
-net.micode.notes:id/iv_bg_white_select = 0x7f050015
-net.micode.notes:id/tv_alert_date = 0x7f05003a
-net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:id/iv_super_select = 0x7f05001d
+net.micode.notes:id/iv_bg_yellow = 0x7f050018
+net.micode.notes:string/error_sync_cancelled = 0x7f0a0014
+net.micode.notes:id/iv_bg_white_select = 0x7f050017
+net.micode.notes:dimen/text_font_size_small = 0x7f030003
+net.micode.notes:string/cancel = 0x7f0a000b
+net.micode.notes:id/iv_bg_white = 0x7f050016
 net.micode.notes:drawable/notification = 0x7f040033
-net.micode.notes:id/iv_bg_red = 0x7f050012
-net.micode.notes:string/menu_font_large = 0x7f0a0027
+net.micode.notes:id/iv_bg_red = 0x7f050014
+net.micode.notes:string/menu_font_large = 0x7f0a002b
 net.micode.notes:drawable/widget_4x_blue = 0x7f04003d
-net.micode.notes:id/iv_large_select = 0x7f050018
-net.micode.notes:id/widget_bg_image = 0x7f050041
-net.micode.notes:id/iv_bg_green_select = 0x7f050011
-net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
+net.micode.notes:id/iv_large_select = 0x7f05001a
+net.micode.notes:id/widget_bg_image = 0x7f050045
+net.micode.notes:id/iv_bg_green_select = 0x7f050013
+net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000f
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004e
 net.micode.notes:drawable/menu_move = 0x7f04002e
 net.micode.notes:drawable/widget_4x_white = 0x7f040040
-net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
-net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
-net.micode.notes:id/font_size_selector = 0x7f05000b
-net.micode.notes:id/et_edit_text = 0x7f050009
-net.micode.notes:id/et_foler_name = 0x7f05000a
+net.micode.notes:id/iv_bg_blue_select = 0x7f050011
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0050
+net.micode.notes:id/font_size_selector = 0x7f05000d
+net.micode.notes:id/et_edit_text = 0x7f05000b
+net.micode.notes:drawable/list_green_middle = 0x7f04001e
+net.micode.notes:id/cancel = 0x7f050007
+net.micode.notes:id/et_foler_name = 0x7f05000c
 net.micode.notes:drawable/edit_green = 0x7f040007
-net.micode.notes:layout/widget_4x = 0x7f06000d
-net.micode.notes:string/search = 0x7f0a0056
-net.micode.notes:id/cb_edit_item = 0x7f050006
-net.micode.notes:id/btn_set_bg_color = 0x7f050005
-net.micode.notes:id/account_dialog_subtitle = 0x7f050000
+net.micode.notes:layout/widget_4x = 0x7f06000e
+net.micode.notes:string/search = 0x7f0a005c
+net.micode.notes:id/cb_edit_item = 0x7f050008
+net.micode.notes:id/btn_set_bg_color = 0x7f050006
+net.micode.notes:id/account_dialog_subtitle = 0x7f050001
 net.micode.notes:menu/note_list = 0x7f070003
-net.micode.notes:id/account_dialog_title = 0x7f050001
-net.micode.notes:id/iv_bg_green = 0x7f050010
-net.micode.notes:id/amPm = 0x7f050003
+net.micode.notes:id/account_dialog_title = 0x7f050002
+net.micode.notes:id/iv_bg_green = 0x7f050012
+net.micode.notes:id/amPm = 0x7f050004
 net.micode.notes:drawable/widget_4x_green = 0x7f04003e
 net.micode.notes:style/NoteTheme = 0x7f0b0003
-net.micode.notes:id/hour = 0x7f05000c
+net.micode.notes:id/hour = 0x7f05000e
 net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032
 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
-net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
 net.micode.notes:drawable/widget_2x_red = 0x7f04003a
 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
-net.micode.notes:id/delete = 0x7f050008
+net.micode.notes:id/delete = 0x7f05000a
 net.micode.notes:drawable/widget_2x_green = 0x7f040039
 net.micode.notes:drawable/title_bar_bg = 0x7f040037
 net.micode.notes:drawable/menu_delete = 0x7f04002d
-net.micode.notes:string/error_sync_internal = 0x7f0a0012
+net.micode.notes:string/error_sync_internal = 0x7f0a0015
 net.micode.notes:drawable/list_green_single = 0x7f04001f
-net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
-net.micode.notes:id/tv_modified_date = 0x7f05003c
+net.micode.notes:string/alert_message_delete_note = 0x7f0a0002
+net.micode.notes:id/tv_modified_date = 0x7f050040
 net.micode.notes:drawable/list_blue_middle = 0x7f040018
-net.micode.notes:id/iv_small_select = 0x7f05001a
+net.micode.notes:id/iv_small_select = 0x7f05001c
 net.micode.notes:menu/note_list_options = 0x7f070005
 net.micode.notes:xml/searchable = 0x7f0c0001
-net.micode.notes:string/menu_folder_delete = 0x7f0a0025
+net.micode.notes:string/menu_folder_delete = 0x7f0a0029
 net.micode.notes:drawable/dropdown_icon = 0x7f040005
-net.micode.notes:id/date = 0x7f050007
+net.micode.notes:id/date = 0x7f050009
 net.micode.notes:drawable/list_yellow_single = 0x7f04002b
 net.micode.notes:drawable/list_red_up = 0x7f040024
 net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
 net.micode.notes:drawable/list_yellow_middle = 0x7f04002a
-net.micode.notes:id/tv_folder_name = 0x7f05003b
+net.micode.notes:id/tv_folder_name = 0x7f05003f
 net.micode.notes:drawable/list_yellow_down = 0x7f040029
-net.micode.notes:string/format_folder_files_count = 0x7f0a001b
 net.micode.notes:drawable/clock = 0x7f040003
 net.micode.notes:drawable/list_white_up = 0x7f040028
 net.micode.notes:drawable/edit_title_blue = 0x7f040009
 net.micode.notes:drawable/edit_red = 0x7f040008
-net.micode.notes:id/iv_alert_icon = 0x7f05000d
-net.micode.notes:layout/dialog_edit_text = 0x7f060003
-net.micode.notes:string/preferences_account_title = 0x7f0a0045
+net.micode.notes:id/iv_alert_icon = 0x7f05000f
+net.micode.notes:layout/dialog_edit_text = 0x7f060004
+net.micode.notes:string/preferences_account_title = 0x7f0a0049
 net.micode.notes:drawable/edit_white = 0x7f04000e
 net.micode.notes:drawable/list_white_middle = 0x7f040026
 net.micode.notes:color/user_query_highlight = 0x7f020002
 net.micode.notes:drawable/list_white_down = 0x7f040025
-net.micode.notes:string/preferences_add_account = 0x7f0a0046
+net.micode.notes:string/preferences_add_account = 0x7f0a004a
 net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
-net.micode.notes:layout/widget_2x = 0x7f06000c
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004b
+net.micode.notes:layout/widget_2x = 0x7f06000d
 net.micode.notes:drawable/list_footer_bg = 0x7f04001c
-net.micode.notes:string/alert_title_delete = 0x7f0a0003
+net.micode.notes:string/alert_title_delete = 0x7f0a0004
 net.micode.notes:drawable/edit_title_green = 0x7f04000a
 net.micode.notes:drawable/icon_app = 0x7f040015
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a0039
 net.micode.notes:drawable/list_red_single = 0x7f040023
-net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0017
 net.micode.notes:drawable/widget_4x_red = 0x7f04003f
-net.micode.notes:id/menu_delete_remind = 0x7f050022
+net.micode.notes:string/menu_sync = 0x7f0a003c
+net.micode.notes:string/app_already_quit = 0x7f0a0005
+net.micode.notes:id/menu_delete_remind = 0x7f050025
 net.micode.notes:drawable/list_red_down = 0x7f040021
 net.micode.notes:drawable/list_red_middle = 0x7f040022
-net.micode.notes:id/iv_bg_white = 0x7f050014
-net.micode.notes:id/iv_bg_red_select = 0x7f050013
-net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
-net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
+net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a0010
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000a
 net.micode.notes:drawable/list_blue_down = 0x7f040017
-net.micode.notes:id/action_select_all = 0x7f050002
-net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
+net.micode.notes:id/action_select_all = 0x7f050003
 net.micode.notes:drawable/font_small = 0x7f040013
-net.micode.notes:string/sync_progress_login = 0x7f0a005e
+net.micode.notes:string/sync_progress_login = 0x7f0a0064
 net.micode.notes:array/menu_share_ways = 0x7f010001
 net.micode.notes:drawable/widget_2x_white = 0x7f04003b
-net.micode.notes:layout/folder_list_item = 0x7f060004
-net.micode.notes:layout/add_account_text = 0x7f060001
-net.micode.notes:id/tv_title = 0x7f05003f
+net.micode.notes:layout/folder_list_item = 0x7f060005
+net.micode.notes:layout/add_account_text = 0x7f060002
+net.micode.notes:id/tv_title = 0x7f050043
 net.micode.notes:color/primary_text_dark = 0x7f020000
 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
 net.micode.notes:drawable/list_blue_up = 0x7f04001a
-net.micode.notes:string/search_setting_description = 0x7f0a0059
+net.micode.notes:string/search_setting_description = 0x7f0a005f
 net.micode.notes:drawable/list_blue_single = 0x7f040019
 net.micode.notes:drawable/font_large = 0x7f040010
 net.micode.notes:drawable/delete = 0x7f040004
 net.micode.notes:drawable/edit_yellow = 0x7f04000f
-net.micode.notes:id/note_item = 0x7f050033
+net.micode.notes:id/note_item = 0x7f050036
 net.micode.notes:drawable/edit_title_white = 0x7f04000c
-net.micode.notes:id/note_edit_list = 0x7f050031
+net.micode.notes:id/note_edit_list = 0x7f050034
 net.micode.notes:drawable/edit_title_red = 0x7f04000b
-net.micode.notes:string/menu_delete = 0x7f0a0021
+net.micode.notes:string/menu_delete = 0x7f0a0025
 net.micode.notes:drawable/list_folder = 0x7f04001b
 net.micode.notes:drawable/call_record = 0x7f040002
-net.micode.notes:string/search_hint = 0x7f0a0057
-net.micode.notes:id/menu_font_size = 0x7f050024
+net.micode.notes:string/search_hint = 0x7f0a005d
+net.micode.notes:id/menu_font_size = 0x7f050027
 net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
 net.micode.notes:drawable/list_yellow_up = 0x7f04002c
-net.micode.notes:dimen/text_font_size_small = 0x7f030003
+net.micode.notes:id/iv_bg_red_select = 0x7f050015
 net.micode.notes:dimen/text_font_size_normal = 0x7f030002
-net.micode.notes:drawable/list_green_middle = 0x7f04001e
 net.micode.notes:drawable/list_background = 0x7f040016
-net.micode.notes:string/app_name = 0x7f0a0004
+net.micode.notes:string/app_name = 0x7f0a0006
 net.micode.notes:menu/note_list_dropdown = 0x7f070004
-net.micode.notes:string/menu_setting = 0x7f0a0036
+net.micode.notes:string/menu_setting = 0x7f0a003a
 net.micode.notes:dimen/text_font_size_medium = 0x7f030001
-net.micode.notes:layout/note_edit_list_item = 0x7f060006
+net.micode.notes:layout/note_edit_list_item = 0x7f060007
 net.micode.notes:layout/account_dialog_title = 0x7f060000
 net.micode.notes:array/format_for_exported_note = 0x7f010000
diff --git a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk
index 61b2c40..45220da 100644
Binary files a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
index c55668d..631e59a 100644
--- a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,525 +1,267 @@
 -- Merging decision tree log ---
 manifest
-<<<<<<< HEAD
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-=======
-<<<<<<< HEAD
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-179:12
+INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-179:12
+INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-179:12
+INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-179:12
+INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-179:12
+INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-179:12
+INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-179:12
 	package
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31
-		INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31
+		INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+		INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
 	android:versionName
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30
-		INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30
+		INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+		INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
 	xmlns:tools
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51
 	xmlns:android
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69
 	android:versionCode
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28
-		INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28
+		INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+		INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
 uses-sdk
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
 	android:targetSdkVersion
-		INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-		INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml
+		INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+		INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
 	tools:ignore
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39
 	android:minSdkVersion
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
-		INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
+		INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
+		INJECTED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
 uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
 uses-permission#android.permission.INTERNET
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
 uses-permission#android.permission.READ_CONTACTS
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
 uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
 uses-permission#android.permission.GET_ACCOUNTS
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
 uses-permission#android.permission.USE_CREDENTIALS
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
 application
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-178:15
 	android:label
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
 	android:icon
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
-activity#net.micode.notes.ui.NotesListActivity
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
-	android:launchMode
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
-	android:windowSoftInputMode
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
+activity#net.micode.notes.ui.LoginActivity
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-58:16
+	android:label
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-45
 	android:exported
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
-	android:uiOptions
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
-	android:configChanges
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-36
+	tools:ignore
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-38
 	android:theme
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-45
 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:54:9-57:25
 action#android.intent.action.MAIN
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:13-65
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:21-62
 category#android.intent.category.LAUNCHER
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74
-activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
-	android:launchMode
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
-	android:exported
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
-	android:configChanges
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
-	android:theme
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
-intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
-	android:scheme
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
-	tools:ignore
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47
-action#android.intent.action.VIEW
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66
-category#android.intent.category.DEFAULT
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-data
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-	android:mimeType
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
-action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76
-intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
-action#android.intent.action.SEARCH
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68
-meta-data#android.app.searchable
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
-	android:resource
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
-provider#net.micode.notes.data.NotesProvider
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
-	android:authorities
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
-	android:multiprocess
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
-	android:exported
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-73
 	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
-receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
-	android:label
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
-	android:exported
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
-intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
-action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
-action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
-action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
-meta-data#android.appwidget.provider
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
-	android:resource
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
-receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
-	android:label
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
-	android:exported
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
-receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
-	android:exported
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
-intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
-action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76
-receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
-	android:process
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
-activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
-	android:label
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
-	android:launchMode
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
-	tools:ignore
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42
-	android:theme
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
-activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
-	android:label
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
-	android:launchMode
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
-	android:theme
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
-service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
-	android:exported
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
-meta-data#android.app.default_searchable
-ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
-	android:value
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
-	android:name
-		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
-=======
-ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
-	package
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31
-		INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-	android:versionName
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30
-		INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-	xmlns:tools
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51
-	xmlns:android
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69
-	android:versionCode
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28
-		INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-uses-sdk
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-	android:targetSdkVersion
-		INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-		INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-	tools:ignore
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39
-	android:minSdkVersion
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
-		INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
-	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
-uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
-	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
-uses-permission#android.permission.INTERNET
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
-	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
-uses-permission#android.permission.READ_CONTACTS
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
-	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
-uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
-	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
-uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
-	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
-uses-permission#android.permission.GET_ACCOUNTS
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
-	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
-uses-permission#android.permission.USE_CREDENTIALS
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
-	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
-uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
-	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
-application
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
-	android:label
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
-	android:icon
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:23-70
 activity#net.micode.notes.ui.NotesListActivity
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:9-73:20
 	android:launchMode
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:13-43
 	android:windowSoftInputMode
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:13-52
 	android:exported
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-36
 	android:uiOptions
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:13-57
 	android:configChanges
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:61:13-74
 	android:theme
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
-	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
-intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
-action#android.intent.action.MAIN
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:13-45
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
-category#android.intent.category.LAUNCHER
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77
-	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-49
 activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:75:5-105:16
 	android:launchMode
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:9-39
 	android:exported
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:80:9-32
 	android:configChanges
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:9-70
 	android:theme
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:79:9-41
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:76:9-44
 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:9-88:25
 	android:scheme
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:24-45
 	tools:ignore
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:13-43
 action#android.intent.action.VIEW
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:13-65
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:21-62
 category#android.intent.category.DEFAULT
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:85:13-72
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:85:23-69
 data
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:86:13-74
 	android:mimeType
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:86:19-71
 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:9-95:25
 action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-75
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:21-72
 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:9-100:25
 action#android.intent.action.SEARCH
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:13-67
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:21-64
 meta-data#android.app.searchable
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:102:9-104:50
 	android:resource
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:13-47
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-50
 provider#net.micode.notes.data.NotesProvider
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:5-111:36
 	android:authorities
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:9-43
 	android:multiprocess
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:9-36
 	android:exported
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:111:9-33
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:9-59
 receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:113:5-126:16
 	android:label
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:115:9-46
 	android:exported
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:116:9-32
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:114:9-53
 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:117:9-121:25
 action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:118:13-80
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:118:21-77
 action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:119:13-81
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:119:21-78
 action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:120:13-81
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:120:21-78
 meta-data#android.appwidget.provider
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-125:54
 	android:resource
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-51
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-54
 receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:127:5-141:16
 	android:label
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:129:9-46
 	android:exported
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-32
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:128:9-53
 receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:5-148:16
 	android:exported
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:9-32
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:15-51
 intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:9-147:25
 action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-75
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:21-72
 receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:5-153:16
 	android:process
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:9-34
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:9-57
 activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:5-161:16
 	android:label
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:9-41
 	android:launchMode
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:158:9-44
 	tools:ignore
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:160:9-38
 	android:theme
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:159:9-71
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:9-46
 activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:163:5-168:16
 	android:label
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:165:9-50
 	android:launchMode
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:166:9-39
 	android:theme
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:167:9-56
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:164:9-67
 service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:170:5-173:15
 	android:exported
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:172:9-33
 	android:name
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:171:9-70
 meta-data#android.app.default_searchable
-ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
+ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:175:5-177:48
 	android:value
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
-	android:name
-<<<<<<< HEAD
-		ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
-=======
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
->>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
->>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:177:9-45
+	android:name
+		ADDED from D:\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:176:9-54
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index abd81ee..9bfca50 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/src/Notes-master3/app/src/main/AndroidManifest.xml b/src/Notes-master3/app/src/main/AndroidManifest.xml
index c733892..6950bb6 100644
--- a/src/Notes-master3/app/src/main/AndroidManifest.xml
+++ b/src/Notes-master3/app/src/main/AndroidManifest.xml
@@ -37,6 +37,25 @@
     <application
         android:icon="@drawable/icon_app"
         android:label="@string/app_name" >
+        <activity
+            android:name=".ui.LoginActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+
+            android:theme="@style/NoteTheme"
+            tools:ignore ="ExtraText" >
+        <!--android:configChanges="keyboardHidden|orientation|screenSize"
+        android:exported="true"
+        android:launchMode="singleTop"
+        android:theme="@style/NoteTheme"
+        android:uiOptions="splitActionBarWhenNarrow"
+        android:windowSoftInputMode="adjustPan">
+        -->
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+    </activity>
         <activity
             android:name=".ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -46,114 +65,115 @@
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan">
 
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".ui.NoteEditActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:exported="true">
-
-            <intent-filter android:scheme="http"
-                tools:ignore="AppLinkUrlError">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/text_note" />
-                <data android:mimeType="vnd.android.cursor.item/call_note" />
-            </intent-filter>
+    <activity
+        android:name=".ui.NoteEditActivity"
+        android:configChanges="keyboardHidden|orientation|screenSize"
+        android:launchMode="singleTop"
+        android:theme="@style/NoteTheme"
+        android:exported="true">
+
+        <intent-filter android:scheme="http"
+            tools:ignore="AppLinkUrlError">
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:mimeType="vnd.android.cursor.item/text_note" />
+            <data android:mimeType="vnd.android.cursor.item/call_note" />
+        </intent-filter>
+
+        <intent-filter>
+            <action android:name="android.intent.action.INSERT_OR_EDIT" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:mimeType="vnd.android.cursor.item/text_note" />
+            <data android:mimeType="vnd.android.cursor.item/call_note" />
+        </intent-filter>
+
+        <intent-filter>
+            <action android:name="android.intent.action.SEARCH" />
+            <category android:name="android.intent.category.DEFAULT" />
+        </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/text_note" />
-                <data android:mimeType="vnd.android.cursor.item/call_note" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
-        </activity>
-
-        <provider
-            android:name="net.micode.notes.data.NotesProvider"
-            android:authorities="micode_notes"
-            android:multiprocess="true"
-            android:exported="false" />
-
-        <receiver
-            android:name=".widget.NoteWidgetProvider_2x"
-            android:label="@string/app_widget2x2"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_2x_info" />
-        </receiver>
-        <receiver
-            android:name=".widget.NoteWidgetProvider_4x"
-            android:label="@string/app_widget4x4"
-            android:exported="true">
-
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_4x_info" />
-        </receiver>
-
-        <receiver android:name=".ui.AlarmInitReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-
-        <receiver
-            android:name="net.micode.notes.ui.AlarmReceiver"
-            android:process=":remote" >
-        </receiver>
-
-        <activity
-            android:name=".ui.AlarmAlertActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar"
-            tools:ignore="RedundantLabel">
-        </activity>
-
-        <activity
-            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-            android:label="@string/preferences_title"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light" >
-        </activity>
+        <meta-data
+            android:name="android.app.searchable"
+            android:resource="@xml/searchable" />
+    </activity>
+
+    <provider
+        android:name="net.micode.notes.data.NotesProvider"
+        android:authorities="micode_notes"
+        android:multiprocess="true"
+        android:exported="false" />
+
+    <receiver
+        android:name=".widget.NoteWidgetProvider_2x"
+        android:label="@string/app_widget2x2"
+        android:exported="true">
+        <intent-filter>
+            <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+            <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+        </intent-filter>
 
-        <service
-            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-            android:exported="false" >
-        </service>
+        <meta-data
+            android:name="android.appwidget.provider"
+            android:resource="@xml/widget_2x_info" />
+    </receiver>
+    <receiver
+        android:name=".widget.NoteWidgetProvider_4x"
+        android:label="@string/app_widget4x4"
+        android:exported="true">
+
+        <intent-filter>
+            <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+            <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+        </intent-filter>
 
         <meta-data
-            android:name="android.app.default_searchable"
-            android:value=".ui.NoteEditActivity" />
-    </application>
+            android:name="android.appwidget.provider"
+            android:resource="@xml/widget_4x_info" />
+    </receiver>
+
+    <receiver android:name=".ui.AlarmInitReceiver"
+        android:exported="true">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
+    <receiver
+        android:name="net.micode.notes.ui.AlarmReceiver"
+        android:process=":remote" >
+    </receiver>
+
+    <activity
+        android:name=".ui.AlarmAlertActivity"
+        android:label="@string/app_name"
+        android:launchMode="singleInstance"
+        android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar"
+        tools:ignore="RedundantLabel">
+    </activity>
+
+    <activity
+        android:name="net.micode.notes.ui.NotesPreferenceActivity"
+        android:label="@string/preferences_title"
+        android:launchMode="singleTop"
+        android:theme="@android:style/Theme.Holo.Light" >
+    </activity>
+
+    <service
+        android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+        android:exported="false" >
+    </service>
+
+    <meta-data
+        android:name="android.app.default_searchable"
+        android:value=".ui.NoteEditActivity" />
+</application>
 </manifest>
diff --git a/src/Notes-master3/app/src/main/res/values/strings.xml b/src/Notes-master3/app/src/main/res/values/strings.xml
index 55df868..32facdb 100644
--- a/src/Notes-master3/app/src/main/res/values/strings.xml
+++ b/src/Notes-master3/app/src/main/res/values/strings.xml
@@ -93,7 +93,7 @@
     <string name="error_sync_network">Sync failed, please check network and account settings</string>
     <string name="error_sync_internal">Sync failed, internal error occurs</string>
     <string name="error_sync_cancelled">Sync is canceled</string>
-    <string name="sync_progress_login">Logging into %1$s...</string>
+    <string name="sync_progress_login">Logging</string>
     <string name="sync_progress_init_list">Getting remote note list...</string>
     <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
     <!-- Preferences -->
@@ -126,6 +126,12 @@
     <string name="search">Notes</string>
     <string name="datetime_dialog_ok">set</string>
     <string name="datetime_dialog_cancel">cancel</string>
+    <string name="cancel">cancel</string>
+    <string name="prompt_password">password</string>
+    <string name="prompt_account">accounnt</string>
+    <string name="app_already_quit">quit</string>
+    <string name="Loading">Loading</string>
+    <string name="invalid">invalid</string>
     <plurals name="search_results_title">
          <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
         <!-- Case of 0 or 2 or more results. -->
diff --git a/src/Notes-master3/local.properties b/src/Notes-master3/local.properties
index e55fbb3..5e45b7e 100644
--- a/src/Notes-master3/local.properties
+++ b/src/Notes-master3/local.properties
@@ -6,5 +6,6 @@
 # header note.
 
 #Thu Mar 30 21:05:00 CST 2023
-sdk.dir=C\:\\Users\\48172\\AppData\\Local\\Android\\Sdk
+sdk.dir=D\:\\androoidSDK
+