diff --git a/doc/泛读报告.docx b/doc/泛读报告.docx
new file mode 100644
index 0000000..862148b
Binary files /dev/null and b/doc/泛读报告.docx differ
diff --git a/src/Notes-master3/.gradle/7.5/checksums/checksums.lock b/src/Notes-master3/.gradle/7.5/checksums/checksums.lock
index f774aeb..b0f2c6b 100644
Binary files a/src/Notes-master3/.gradle/7.5/checksums/checksums.lock and b/src/Notes-master3/.gradle/7.5/checksums/checksums.lock differ
diff --git a/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin
index fc2523e..bc7ea7c 100644
Binary files a/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin and b/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin differ
diff --git a/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin
index 415d955..668ba5d 100644
Binary files a/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin and b/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin differ
diff --git a/src/Notes-master3/.idea/checkstyle-idea.xml b/src/Notes-master3/.idea/checkstyle-idea.xml
deleted file mode 100644
index ac8ae2c..0000000
--- a/src/Notes-master3/.idea/checkstyle-idea.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA" serialisationVersion="2">
-    <checkstyleVersion>10.7.0</checkstyleVersion>
-    <scanScope>JavaOnly</scanScope>
-    <copyLibs>true</copyLibs>
-    <option name="thirdPartyClasspath" />
-    <option name="activeLocationIds" />
-    <option name="locations">
-      <list>
-        <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
-        <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/Notes-master3/.idea/deploymentTargetDropDown.xml b/src/Notes-master3/.idea/deploymentTargetDropDown.xml
index 86b11a9..9ab0eaf 100644
--- a/src/Notes-master3/.idea/deploymentTargetDropDown.xml
+++ b/src/Notes-master3/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,10 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
+<<<<<<< HEAD
+    <timeTargetWasSelectedWithDropDown value="2023-03-28T10:51:38.430158700Z" />
+=======
     <timeTargetWasSelectedWithDropDown value="2023-04-07T09:01:01.813209800Z" />
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
   </component>
 </project>
\ No newline at end of file
diff --git a/src/Notes-master3/.idea/gradle.xml b/src/Notes-master3/.idea/gradle.xml
index df39334..6e5389e 100644
--- a/src/Notes-master3/.idea/gradle.xml
+++ b/src/Notes-master3/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-11" />
+        <option name="gradleJvm" value="Android Studio default JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/src/Notes-master3/.idea/vcs.xml b/src/Notes-master3/.idea/vcs.xml
deleted file mode 100644
index b2bdec2..0000000
--- a/src/Notes-master3/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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 cb8753f..f17eba1 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/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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_0/graph.bin 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_1/graph.bin 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_2/graph.bin 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_3/graph.bin 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_4/graph.bin 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_5/graph.bin 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_6/graph.bin 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
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_7/graph.bin 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 872c0d9..6746ba5 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,3 +1,4 @@
+<<<<<<< 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
@@ -94,3 +95,200 @@ net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\study\\rjgc\\
 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
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 d7b52c9..64ae73e 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,5 +1,13 @@
 <?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
         <item>-%s</item>      
         <item>--%s</item>     
         <item>--%s</item>     
@@ -7,11 +15,27 @@
     </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">
          <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
         <item name="android:textSize">@dimen/text_font_size_super</item>
         <item name="android:textColorLink">#0000ff</item>
     </style><style name="TextAppearanceLarge">
@@ -43,7 +67,24 @@
     </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
         <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">
@@ -53,4 +94,9 @@
         <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">
         <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:\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>
\ No newline at end of file
+<<<<<<< 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
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 76b7273..4111d64 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\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>
\ No newline at end of file
+<<<<<<< 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
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 e549732..ecc5b17 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\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>
\ No newline at end of file
+<<<<<<< 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
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 fc4d47e..9c74751 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\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>
\ No newline at end of file
+<<<<<<< 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
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 3fc146e..ddf2eac 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,4 +1,14 @@
+<<<<<<< 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
 renamed.0=classes.dex
 path.0=classes.dex
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 d5e63f2..6b6a53d 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,7 +20,276 @@
 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
+23        android:minSdkVersion="14"
+23-->D:\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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+35
+36    <application
+36-->D:\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
+37        android:debuggable="true"
+38        android:icon="@drawable/icon_app"
+38-->D:\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
+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>
+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
+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
+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" />
@@ -282,3 +551,4 @@
 154    </application>
 155
 156</manifest>
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
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 164a35d..14362a9 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
@@ -4,7 +4,15 @@
             "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.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
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -23,7 +31,15 @@
                     }
                 },
                 {
+<<<<<<< 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
                     "from": {
                         "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -47,7 +63,48 @@
             "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\\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
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -64,7 +121,54 @@
                     }
                 },
                 {
+<<<<<<< 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
+                    "from": {
+                        "startLines": "19,26",
+                        "startColumns": "4,4",
+                        "startOffsets": "739,1047",
+                        "endLines": "24,29",
+                        "endColumns": "19,19",
+                        "endOffsets": "1041,1162"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+<<<<<<< HEAD
+                    "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                    },
+                    "to": {
+                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                    }
+                },
+                {
+                    "source": "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
                     "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",
@@ -81,6 +185,8 @@
                         "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",
@@ -136,6 +242,7 @@
                         "endColumns": "19,19",
                         "endOffsets": "295,415"
                     }
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                 }
             ]
         },
@@ -143,7 +250,38 @@
             "outputFile": "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
                     "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",
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 539c6cc..590e7da 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
@@ -4,7 +4,15 @@
             "outputFile": "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
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -23,7 +31,15 @@
                     }
                 },
                 {
+<<<<<<< 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
                     "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",
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 fa84bf2..5259af8 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,7 +4,38 @@
             "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
                     "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",
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 fef46d6..7a1b44b 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,7 +4,48 @@
             "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",
+                    "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
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -21,7 +62,54 @@
                     }
                 },
                 {
+<<<<<<< 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
+                    "from": {
+                        "startLines": "19,26",
+                        "startColumns": "4,4",
+                        "startOffsets": "739,1047",
+                        "endLines": "24,29",
+                        "endColumns": "19,19",
+                        "endOffsets": "1041,1162"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+<<<<<<< HEAD
+                    "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                    },
+                    "to": {
+                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                    }
+                },
+                {
+                    "source": "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
                     "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",
@@ -38,6 +126,8 @@
                         "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",
@@ -93,6 +183,7 @@
                         "endColumns": "19,19",
                         "endOffsets": "295,415"
                     }
+>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
                 }
             ]
         }
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 fbb2862..ca64e25 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,3 +1,4 @@
+<<<<<<< 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
@@ -6,3 +7,24 @@ net.micode.notes.app-mergeDebugResources-4 D:\study\rjgc\wrok\gitProject\src\Not
 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
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 540cdf3..c55668d 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,5 +1,6 @@
 -- 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
@@ -7,6 +8,270 @@ INJECTED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\Andro
 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
+	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
+	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
+	xmlns:tools
+		ADDED from D:\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
+	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
+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
+	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
+	tools:ignore
+		ADDED from D:\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
+uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
+ADDED from D:\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
+uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
+ADDED from D:\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
+uses-permission#android.permission.INTERNET
+ADDED from D:\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
+uses-permission#android.permission.READ_CONTACTS
+ADDED from D:\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
+uses-permission#android.permission.MANAGE_ACCOUNTS
+ADDED from D:\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
+uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
+ADDED from D:\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
+uses-permission#android.permission.GET_ACCOUNTS
+ADDED from D:\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
+uses-permission#android.permission.USE_CREDENTIALS
+ADDED from D:\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
+uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
+ADDED from D:\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
+application
+ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
+	android:label
+		ADDED from D:\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
+	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
+	android:theme
+		ADDED from D:\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
+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
+action#android.intent.action.MAIN
+ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
+	android:name
+		ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
+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
+	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
@@ -252,4 +517,9 @@ ADDED from D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\AndroidM
 	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
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 96a9ff8..a674d7a 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -430,7 +430,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         if (id == R.id.btn_set_bg_color) {
             mNoteBgColorSelector.setVisibility(View.VISIBLE);
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
-                    -                    View.VISIBLE);
+                    View.VISIBLE);
         } else if (sBgSelectorBtnsMap.containsKey(id)) {
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
                     View.GONE);
diff --git a/src/Notes-master3/local.properties b/src/Notes-master3/local.properties
index f725db6..e55fbb3 100644
--- a/src/Notes-master3/local.properties
+++ b/src/Notes-master3/local.properties
@@ -4,5 +4,7 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Fri Apr 07 16:53:50 CST 2023
-sdk.dir=D\:\\study\\rjgc\\SDK
+
+#Thu Mar 30 21:05:00 CST 2023
+sdk.dir=C\:\\Users\\48172\\AppData\\Local\\Android\\Sdk
+