Merge pull request '合并' (#2) from a_branch into master

src/Notes-master1/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Nov 06 21:37:46 CST 2023
+#Thu Jan 04 08:38:37 CST 2024
 gradle.version=8.0

src/Notes-master1/.idea/gradle.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>

src/Notes-master1/.idea/misc.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
@@ -6,11 +7,4 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="VisualizationToolProject">
-    <option name="state">
-      <ProjectState>
-        <option name="scale" value="0.07379862700228833" />
-      </ProjectState>
-    </option>
-  </component>
 </project>

src/Notes-master1/app/build.gradle

@@ -6,8 +6,8 @@ android {
     buildToolsVersion "34.0.0"
 
     defaultConfig {
-        useLibrary'org.apache.http.legacy'
         applicationId "net.micode.notes"
+        useLibrary'org.apache.http.legacy'
         minSdkVersion 14
         targetSdkVersion 14
     }
@@ -18,13 +18,4 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
-    packagingOptions {
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-    }
-
 }
-

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

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

src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,101 +1,96 @@
-#Wed Jan 03 14:18:25 CST 2024
+#Thu Jan 04 08:46:36 CST 2024
-net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
+net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
-net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
+net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
-net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
+net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
-net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
+net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
-net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
+net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
-net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
+net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
-net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
+net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
-net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
-net.micode.notes.app-main-5\:/drawable-hdpi/grass.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\grass.png
+net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
-net.micode.notes.app-main-5\:/drawable-hdpi/huiting.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\huiting.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
-net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/lanyangyang.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\lanyangyang.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
-net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
+net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
-net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
+net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
-net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
+net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
-net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
+net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
-net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
+net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
-net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
+net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
-net.micode.notes.app-main-5\:/drawable-hdpi/playground.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\playground.png
+net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/playground1.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\playground1.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
-net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
-net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
-net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
-net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
+net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
+net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
+net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
+net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
+net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
-net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
+net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
-net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
+net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
-net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
+net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
-net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
+net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
-net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
+net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
-net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
+net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
-net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
+net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
-net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
+net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
-net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
+net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
-net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
+net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
-net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
+net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
-net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
+net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
-net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
+net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
-net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
+net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
-net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
+net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
-net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
+net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
-net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
+net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
-net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
+net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
-net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
+net.micode.notes.app-main-5\:/raw/introduction=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
-net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
+net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
-net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
+net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
-net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
+net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
-net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
+net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
-net.micode.notes.app-main-5\:/raw/introduction=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
-net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
-net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
-net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
-net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml

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

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

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

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\anzhuo studio\2\Notes-master1\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:\anzhuo studio\2\Notes-master1\app\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\anzhuo studio\2\Notes-master2\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:\anzhuo studio\2\Notes-master2\app\src\debug\jniLibs"/></dataSet></merger>

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

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\anzhuo studio\2\Notes-master1\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:\anzhuo studio\2\Notes-master1\app\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\anzhuo studio\2\Notes-master2\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:\anzhuo studio\2\Notes-master2\app\src\debug\shaders"/></dataSet></merger>

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

@@ -1,4 +1,4 @@
-#Thu Jan 04 08:35:07 CST 2024
+#Thu Jan 04 08:47:01 CST 2024
-base.0=D\:\\anzhuo studio\\2\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+base.0=D\:\\anzhuo studio\\2\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex

src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt

@@ -31,9 +31,7 @@ drawable font_normal
 drawable font_size_selector_bg
 drawable font_small
 drawable font_super
-drawable grass
 drawable icon_app
-drawable lanyangyang
 drawable list_background
 drawable list_blue_down
 drawable list_blue_middle
@@ -64,7 +62,6 @@ drawable new_note_normal
 drawable new_note_pressed
 drawable note_edit_color_selector_panel
 drawable notification
-drawable playground1
 drawable search_result
 drawable selected
 drawable title_alert
@@ -116,13 +113,12 @@ id menu_delete
 id menu_delete_remind
 id menu_export_text
 id menu_font_size
-id menu_grass
-id menu_lanyangyang
 id menu_list_mode
 id menu_new_folder
 id menu_new_note
-id menu_playground1
+id menu_quit_secret
 id menu_search
+id menu_secret
 id menu_send_to_desktop
 id menu_setting
 id menu_share
@@ -216,15 +212,14 @@ string menu_font_normal
 string menu_font_size
 string menu_font_small
 string menu_font_super
-string menu_grass
-string menu_lanyangyang
 string menu_list_mode
 string menu_move
 string menu_move_parent_folder
 string menu_normal_mode
-string menu_playground1
+string menu_quit_secret
 string menu_remove_remind
 string menu_search
+string menu_secret
 string menu_select_all
 string menu_select_none
 string menu_select_title

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

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

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

@@ -1,29 +1,10 @@
 {
     "logs": [
         {
-            "outputFile": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat",
+            "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
             "map": [
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "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"
-                    }
-                },
-                {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
                         "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -40,68 +21,40 @@
                         "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
                         "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
                     }
-                }
-            ]
                 },
                 {
-            "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-            "map": [
-                {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1",
+                        "startLines": "18",
-                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startColumns": "4",
-                        "startOffsets": "-1,-1,-1,-1,-1"
+                        "startOffsets": "712",
+                        "endLines": "21",
+                        "endColumns": "19",
+                        "endOffsets": "817"
                     },
                     "to": {
-                        "startLines": "13,14,15,16,17",
+                        "startLines": "2",
-                        "startColumns": "4,4,4,4,4",
+                        "startColumns": "4",
-                        "startOffsets": "477,529,582,635,687",
+                        "startOffsets": "105",
-                        "endColumns": "51,52,52,51,51",
+                        "endLines": "5",
-                        "endOffsets": "524,577,630,682,734"
+                        "endColumns": "19",
+                        "endOffsets": "210"
                     }
-                },
-                {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,44,-1,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "8222,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2186,-1,-1,-1,-1,-1,2242,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,44,-1,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55,-1,-1,-1,-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "8626,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2237,-1,-1,-1,-1,-1,2305,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4106,4174,4234,4287,4353,4415,4483,4546,4593,4648,4736,4794,4856,4906,4951,4994,5054,5121,5176,5231,5284,5331,5384,5440,5488,5543,5596,5680,5747,5811,5907,5981,6062,6151,6314,6458,6537,6612,6694,6753,6833,6913,6968,7090,7193,7234,7287,7344,7418,7483,7551,7637,7717,7786,7880,7939,7994,8056,8116,8226",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
-                        "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,55,67,59,52,65,61,67,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,4101,4169,4229,4282,4348,4410,4478,4541,4588,4643,4731,4789,4851,4901,4946,4989,5049,5116,5171,5226,5279,5326,5379,5435,5483,5538,5591,5675,5742,5806,5902,5976,6057,6146,6309,6453,6532,6607,6689,6748,6828,6908,6963,7085,7188,7229,7282,7339,7413,7478,7546,7632,7712,7781,7875,7934,7989,8051,8111,8221,8311"
                 }
+            ]
         },
         {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+            "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
-                    "from": {
+            "map": [
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "128,132,136,140,143,147,151,155,159,163,167",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8316,8520,8731,8941,9101,9284,9469,9654,9857,10063,10246",
-                        "endLines": "131,135,139,142,146,150,154,158,162,166,170",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8515,8726,8936,9096,9279,9464,9649,9852,10058,10241,10442"
-                    }
-                },
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
-                        "startLines": "-1,-1",
+                        "startLines": "19,26",
-                        "startColumns": "-1,-1",
+                        "startColumns": "4,4",
-                        "startOffsets": "-1,-1"
+                        "startOffsets": "739,1047",
+                        "endLines": "24,29",
+                        "endColumns": "19,19",
+                        "endOffsets": "1041,1162"
                     },
                     "to": {
                         "startLines": "2,8",
@@ -113,63 +66,26 @@
                     }
                 },
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "-1",
-                        "startColumns": "-1",
-                        "startOffsets": "-1"
-                    },
-                    "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
-                    }
-                }
-            ]
-        },
-        {
-            "outputFile": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat",
-            "map": [
-                {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\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:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "133,77,80,79,78,19,20,21,123,124,132,131,26,86,87,85,84,83,99,98,97,89,39,38,69,29,30,90,46,81,125,76,72,47,53,58,48,68,67,66,62,61,59,60,63,44,64,54,75,65,43,73,52,57,56,55,71,51,70,49,50,74,28,34,36,33,35,32,31,25,24,106,105,109,121,114,113,115,116,118,117,107,108,112,110,111,104,119,120,130,128,127,129,27,88,96,101,100,102,95,94,93,92,22,23",
+                        "startLines": "133,72,75,74,73,19,20,21,118,119,132,131,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,124,68,47,123,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,130,128,127,129,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,4,4",
-                        "startOffsets": "8156,4046,4307,4211,4142,827,870,922,7654,7703,8098,8047,1282,4761,4855,4690,4606,4523,5722,5639,5537,5031,2004,1953,3545,1486,1539,5092,2245,4390,7766,3975,3730,2304,2619,2920,2362,3474,3413,3356,3134,3082,2979,3032,3184,2184,3234,2666,3909,3294,2118,3779,2572,2865,2777,2719,3668,2522,3623,2419,2462,3842,1431,1750,1858,1703,1805,1647,1599,1227,1174,6178,6111,6419,7557,6783,6702,6857,6946,7188,7109,6262,6337,6643,6483,6563,6056,7332,7454,8006,7879,7822,7932,1366,4963,5451,5857,5788,5937,5392,5337,5275,5215,974,1084",
+                        "startOffsets": "8108,3898,4159,4063,3994,827,870,922,7506,7555,8050,7999,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,7720,3631,2424,7675,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7958,7831,7774,7884,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
-                        "endLines": "137,77,80,79,78,19,20,21,123,124,132,131,26,86,87,85,84,83,99,98,97,89,39,38,69,29,30,90,46,81,125,76,72,47,53,58,48,68,67,66,62,61,59,60,63,44,64,54,75,65,43,73,52,57,56,55,71,51,70,49,50,74,28,34,36,33,35,32,31,25,24,106,105,109,121,114,113,115,116,118,117,107,108,112,110,111,104,119,120,130,128,127,129,27,88,96,101,100,102,95,94,93,92,22,23",
+                        "endLines": "137,72,75,74,73,19,20,21,118,119,132,131,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,124,68,47,123,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,130,128,127,129,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,59,52,65,61,65,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",
+                        "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,51,62,46,44,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": "8560,4137,4385,4302,4206,865,917,969,7698,7761,8151,8093,1361,4850,4958,4756,4685,4601,5783,5717,5634,5087,2061,1999,3618,1534,1594,5192,2299,4487,7816,4041,3774,2357,2661,2974,2414,3540,3469,3408,3179,3129,3027,3077,3229,2239,3289,2714,3970,3351,2179,3837,2614,2915,2860,2772,3725,2567,3663,2457,2517,3904,1481,1800,1906,1745,1853,1698,1642,1277,1222,6257,6173,6478,7648,6852,6778,6941,7104,7327,7183,6332,6414,6697,6558,6638,6106,7449,7552,8042,7927,7874,8001,1426,5026,5532,5932,5852,6026,5446,5387,5332,5270,1079,1169"
+                        "endOffsets": "8512,3989,4237,4154,4058,865,917,969,7550,7613,8103,8045,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,7767,3689,2466,7715,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7994,7879,7826,7953,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
                     },
                     "to": {
                         "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4170,4223,4289,4351,4417,4480,4527,4582,4670,4728,4790,4840,4885,4928,4988,5055,5110,5165,5218,5265,5318,5374,5422,5477,5530,5614,5681,5745,5841,5915,5996,6085,6248,6392,6471,6546,6628,6687,6767,6847,6902,7024,7127,7168,7221,7278,7352,7417,7485,7571,7651,7720,7814,7873,7928,7990,8050,8160",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4343,4406,4453,4498,4553,4641,4699,4761,4811,4856,4899,4959,5026,5081,5136,5189,5236,5289,5345,5393,5448,5501,5585,5652,5716,5812,5886,5967,6056,6219,6363,6442,6517,6599,6658,6738,6818,6873,6995,7098,7139,7192,7249,7323,7388,7456,7542,7622,7691,7785,7844,7899,7961,8021,8131",
                         "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126",
-                        "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,59,52,65,61,65,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",
+                        "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,51,62,46,44,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,4165,4218,4284,4346,4412,4475,4522,4577,4665,4723,4785,4835,4880,4923,4983,5050,5105,5160,5213,5260,5313,5369,5417,5472,5525,5609,5676,5740,5836,5910,5991,6080,6243,6387,6466,6541,6623,6682,6762,6842,6897,7019,7122,7163,7216,7273,7347,7412,7480,7566,7646,7715,7809,7868,7923,7985,8045,8155,8245"
+                        "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,4338,4401,4448,4493,4548,4636,4694,4756,4806,4851,4894,4954,5021,5076,5131,5184,5231,5284,5340,5388,5443,5496,5580,5647,5711,5807,5881,5962,6051,6214,6358,6437,6512,6594,6653,6733,6813,6868,6990,7093,7134,7187,7244,7318,7383,7451,7537,7617,7686,7780,7839,7894,7956,8016,8126,8216"
                     }
                 },
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\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",
@@ -181,33 +97,14 @@
                     "to": {
                         "startLines": "127,131,135,139,142,146,150,154,158,162,166",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8250,8454,8665,8875,9035,9218,9403,9588,9791,9997,10180",
+                        "startOffsets": "8221,8425,8636,8846,9006,9189,9374,9559,9762,9968,10151",
                         "endLines": "130,134,138,141,145,149,153,157,161,165,169",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8449,8660,8870,9030,9213,9398,9583,9786,9992,10175,10376"
+                        "endOffsets": "8420,8631,8841,9001,9184,9369,9554,9757,9963,10146,10347"
                     }
                 },
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml",
-                    "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"
-                    }
-                },
-                {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -222,14 +119,31 @@
                         "endColumns": "56",
                         "endOffsets": "472"
                     }
+                },
+                {
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\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"
+                    }
                 }
             ]
         },
         {
-            "outputFile": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat",
+            "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
             "map": [
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -248,7 +162,7 @@
                     }
                 },
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",

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

@@ -4,26 +4,7 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml",
             "map": [
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "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"
-                    }
-                },
-                {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
                         "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -40,6 +21,25 @@
                         "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
                         "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
                     }
+                },
+                {
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "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"
+                    }
                 }
             ]
         }

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

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

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

@@ -4,61 +4,14 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
             "map": [
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1",
+                        "startLines": "19,26",
-                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startColumns": "4,4",
-                        "startOffsets": "-1,-1,-1,-1,-1"
+                        "startOffsets": "739,1047",
-                    },
+                        "endLines": "24,29",
-                    "to": {
+                        "endColumns": "19,19",
-                        "startLines": "13,14,15,16,17",
+                        "endOffsets": "1041,1162"
-                        "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:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,44,-1,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "8222,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2186,-1,-1,-1,-1,-1,2242,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,44,-1,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55,-1,-1,-1,-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "8626,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2237,-1,-1,-1,-1,-1,2305,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4106,4174,4234,4287,4353,4415,4483,4546,4593,4648,4736,4794,4856,4906,4951,4994,5054,5121,5176,5231,5284,5331,5384,5440,5488,5543,5596,5680,5747,5811,5907,5981,6062,6151,6314,6458,6537,6612,6694,6753,6833,6913,6968,7090,7193,7234,7287,7344,7418,7483,7551,7637,7717,7786,7880,7939,7994,8056,8116,8226",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
-                        "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,55,67,59,52,65,61,67,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,4101,4169,4229,4282,4348,4410,4478,4541,4588,4643,4731,4789,4851,4901,4946,4989,5049,5116,5171,5226,5279,5326,5379,5435,5483,5538,5591,5675,5742,5806,5902,5976,6057,6146,6309,6453,6532,6607,6689,6748,6828,6908,6963,7085,7188,7229,7282,7339,7413,7478,7546,7632,7712,7781,7875,7934,7989,8051,8111,8221,8311"
-                    }
-                },
-                {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
-                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "128,132,136,140,143,147,151,155,159,163,167",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8316,8520,8731,8941,9101,9284,9469,9654,9857,10063,10246",
-                        "endLines": "131,135,139,142,146,150,154,158,162,166,170",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8515,8726,8936,9096,9279,9464,9649,9852,10058,10241,10442"
-                    }
-                },
-                {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
-                    "from": {
-                        "startLines": "-1,-1",
-                        "startColumns": "-1,-1",
-                        "startOffsets": "-1,-1"
                     },
                     "to": {
                         "startLines": "2,8",
@@ -70,63 +23,26 @@
                     }
                 },
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "-1",
-                        "startColumns": "-1",
-                        "startOffsets": "-1"
-                    },
-                    "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
-                    }
-                }
-            ]
-        },
-        {
-            "outputFile": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-2:\\values\\values.xml",
-            "map": [
-                {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\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:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "133,77,80,79,78,19,20,21,123,124,132,131,26,86,87,85,84,83,99,98,97,89,39,38,69,29,30,90,46,81,125,76,72,47,53,58,48,68,67,66,62,61,59,60,63,44,64,54,75,65,43,73,52,57,56,55,71,51,70,49,50,74,28,34,36,33,35,32,31,25,24,106,105,109,121,114,113,115,116,118,117,107,108,112,110,111,104,119,120,130,128,127,129,27,88,96,101,100,102,95,94,93,92,22,23",
+                        "startLines": "133,72,75,74,73,19,20,21,118,119,132,131,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,124,68,47,123,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,130,128,127,129,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,4,4",
-                        "startOffsets": "8156,4046,4307,4211,4142,827,870,922,7654,7703,8098,8047,1282,4761,4855,4690,4606,4523,5722,5639,5537,5031,2004,1953,3545,1486,1539,5092,2245,4390,7766,3975,3730,2304,2619,2920,2362,3474,3413,3356,3134,3082,2979,3032,3184,2184,3234,2666,3909,3294,2118,3779,2572,2865,2777,2719,3668,2522,3623,2419,2462,3842,1431,1750,1858,1703,1805,1647,1599,1227,1174,6178,6111,6419,7557,6783,6702,6857,6946,7188,7109,6262,6337,6643,6483,6563,6056,7332,7454,8006,7879,7822,7932,1366,4963,5451,5857,5788,5937,5392,5337,5275,5215,974,1084",
+                        "startOffsets": "8108,3898,4159,4063,3994,827,870,922,7506,7555,8050,7999,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,7720,3631,2424,7675,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7958,7831,7774,7884,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
-                        "endLines": "137,77,80,79,78,19,20,21,123,124,132,131,26,86,87,85,84,83,99,98,97,89,39,38,69,29,30,90,46,81,125,76,72,47,53,58,48,68,67,66,62,61,59,60,63,44,64,54,75,65,43,73,52,57,56,55,71,51,70,49,50,74,28,34,36,33,35,32,31,25,24,106,105,109,121,114,113,115,116,118,117,107,108,112,110,111,104,119,120,130,128,127,129,27,88,96,101,100,102,95,94,93,92,22,23",
+                        "endLines": "137,72,75,74,73,19,20,21,118,119,132,131,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,124,68,47,123,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,130,128,127,129,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,59,52,65,61,65,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",
+                        "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,51,62,46,44,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": "8560,4137,4385,4302,4206,865,917,969,7698,7761,8151,8093,1361,4850,4958,4756,4685,4601,5783,5717,5634,5087,2061,1999,3618,1534,1594,5192,2299,4487,7816,4041,3774,2357,2661,2974,2414,3540,3469,3408,3179,3129,3027,3077,3229,2239,3289,2714,3970,3351,2179,3837,2614,2915,2860,2772,3725,2567,3663,2457,2517,3904,1481,1800,1906,1745,1853,1698,1642,1277,1222,6257,6173,6478,7648,6852,6778,6941,7104,7327,7183,6332,6414,6697,6558,6638,6106,7449,7552,8042,7927,7874,8001,1426,5026,5532,5932,5852,6026,5446,5387,5332,5270,1079,1169"
+                        "endOffsets": "8512,3989,4237,4154,4058,865,917,969,7550,7613,8103,8045,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,7767,3689,2466,7715,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7994,7879,7826,7953,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
                     },
                     "to": {
                         "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4170,4223,4289,4351,4417,4480,4527,4582,4670,4728,4790,4840,4885,4928,4988,5055,5110,5165,5218,5265,5318,5374,5422,5477,5530,5614,5681,5745,5841,5915,5996,6085,6248,6392,6471,6546,6628,6687,6767,6847,6902,7024,7127,7168,7221,7278,7352,7417,7485,7571,7651,7720,7814,7873,7928,7990,8050,8160",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4343,4406,4453,4498,4553,4641,4699,4761,4811,4856,4899,4959,5026,5081,5136,5189,5236,5289,5345,5393,5448,5501,5585,5652,5716,5812,5886,5967,6056,6219,6363,6442,6517,6599,6658,6738,6818,6873,6995,7098,7139,7192,7249,7323,7388,7456,7542,7622,7691,7785,7844,7899,7961,8021,8131",
                         "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126",
-                        "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,59,52,65,61,65,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",
+                        "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,51,62,46,44,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,4165,4218,4284,4346,4412,4475,4522,4577,4665,4723,4785,4835,4880,4923,4983,5050,5105,5160,5213,5260,5313,5369,5417,5472,5525,5609,5676,5740,5836,5910,5991,6080,6243,6387,6466,6541,6623,6682,6762,6842,6897,7019,7122,7163,7216,7273,7347,7412,7480,7566,7646,7715,7809,7868,7923,7985,8045,8155,8245"
+                        "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,4338,4401,4448,4493,4548,4636,4694,4756,4806,4851,4894,4954,5021,5076,5131,5184,5231,5284,5340,5388,5443,5496,5580,5647,5711,5807,5881,5962,6051,6214,6358,6437,6512,6594,6653,6733,6813,6868,6990,7093,7134,7187,7244,7318,7383,7451,7537,7617,7686,7780,7839,7894,7956,8016,8126,8216"
                     }
                 },
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\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",
@@ -138,33 +54,14 @@
                     "to": {
                         "startLines": "127,131,135,139,142,146,150,154,158,162,166",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8250,8454,8665,8875,9035,9218,9403,9588,9791,9997,10180",
+                        "startOffsets": "8221,8425,8636,8846,9006,9189,9374,9559,9762,9968,10151",
                         "endLines": "130,134,138,141,145,149,153,157,161,165,169",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8449,8660,8870,9030,9213,9398,9583,9786,9992,10175,10376"
+                        "endOffsets": "8420,8631,8841,9001,9184,9369,9554,9757,9963,10146,10347"
-                    }
-                },
-                {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
-                    "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"
                     }
                 },
                 {
-                    "source": "D:\\anzhuo studio\\2\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -179,6 +76,23 @@
                         "endColumns": "56",
                         "endOffsets": "472"
                     }
+                },
+                {
+                    "source": "D:\\anzhuo studio\\2\\Notes-master2\\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"
+                    }
                 }
             ]
         }

src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json

@@ -1,406 +1,382 @@
 [
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_background.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_middle.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_background.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_middle.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_small.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_normal.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_small.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_normal.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_icon_app.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_single.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\icon_app.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_single.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_grass.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_green.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\grass.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_green.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_call_note_edit.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_search_result.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\call_note_edit.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/search_result.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_green.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_dropdown_menu.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_green.png"
+        "source": "net.micode.notes.app-main-6:/layout/note_list_dropdown_menu.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_widget_2x_info.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_super.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\widget_2x_info.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_super.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_dropdown_icon.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_blue.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\dropdown_icon.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_blue.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_yellow.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/menu_sub_folder.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_yellow.png"
+        "source": "net.micode.notes.app-main-6:/menu/sub_folder.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_footer_bg.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_yellow.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_footer_bg.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_yellow.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_list_options.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_pressed.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_list_options.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_pressed.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_green.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/color_secondary_text_dark.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_green.9.png"
+        "source": "net.micode.notes.app-main-6:/color/secondary_text_dark.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_size_selector_bg.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_dropdown_icon.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_size_selector_bg.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/dropdown_icon.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_red.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_middle.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_red.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_middle.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_single.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/color_primary_text_dark.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_single.9.png"
+        "source": "net.micode.notes.app-main-6:/color/primary_text_dark.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_green.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_single.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_green.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_single.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\color_secondary_text_dark.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_delete.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\color\\secondary_text_dark.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/delete.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_call_record_folder.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_middle.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\call_record_folder.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_middle.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_menu_delete.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_normal.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\menu_delete.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_normal.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_playground1.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_dialog_edit_text.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\playground1.png"
+        "source": "net.micode.notes.app-main-6:/layout/dialog_edit_text.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_background.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\note_edit_color_selector_panel.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_background.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_yellow.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_yellow.9.png"
+        "source": "net.micode.notes.app-main-6:/layout/note_edit.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_blue.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_down.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_blue.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_down.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_white.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit_list_item.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_white.png"
+        "source": "net.micode.notes.app-main-6:/layout/note_edit_list_item.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_clock.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_size_selector_bg.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\clock.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_size_selector_bg.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_call_record.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_bar_bg.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\call_record.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_bar_bg.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_normal.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_up.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_normal.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_up.9.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_yellow.png.flat",
-        "source": "net.micode.notes.app-main-6:/layout/note_list.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_yellow.png"
-    },
-    {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_widget_4x.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\widget_4x.xml"
-    },
-    {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_edit_list_item.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_edit_list_item.xml"
-    },
-    {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_account_dialog_title.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\account_dialog_title.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_folder_list_item.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_footer_bg.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\folder_list_item.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_footer_bg.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_red.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_down.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_red.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_down.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_blue.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_folder_list_item.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_blue.9.png"
+        "source": "net.micode.notes.app-main-6:/layout/folder_list_item.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_settings_header.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_small.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\settings_header.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_small.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_white.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_green.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_white.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_green.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_delete.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_color_btn_mask.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\delete.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_color_btn_mask.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_notification.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_down.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\notification.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_down.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_single.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_up.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_single.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_up.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_yellow.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_single.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_yellow.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_single.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_list_dropdown_menu.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_green.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_list_dropdown_menu.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_green.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_list_footer.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_list_footer.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/note_edit_color_selector_panel.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_widget_2x.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_up.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\widget_2x.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_up.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_menu_move.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_clock.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\menu_move.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/clock.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_down.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_white.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_down.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_white.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_white.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_white.9.png"
+        "source": "net.micode.notes.app-main-6:/layout/note_list.xml"
-    },
-    {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_up.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_up.9.png"
-    },
-    {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_lanyangyang.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\lanyangyang.png"
-    },
-    {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_list.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_list.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_green.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_red.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_green.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_red.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\raw_introduction.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_dropdown.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\raw\\introduction"
+        "source": "net.micode.notes.app-main-6:/menu/note_list_dropdown.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_selected.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_item.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\selected.png"
+        "source": "net.micode.notes.app-main-6:/layout/note_item.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_add_account_text.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/xml_searchable.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\add_account_text.xml"
+        "source": "net.micode.notes.app-main-6:/xml/searchable.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_down.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_icon_app.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_down.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/icon_app.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_up.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_move.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_up.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_move.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_title_alert.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_btn_set_color.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\title_alert.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_btn_set_color.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_blue.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_down.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_blue.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_down.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_title_bar_bg.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_footer.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\title_bar_bg.9.png"
+        "source": "net.micode.notes.app-main-6:/layout/note_list_footer.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\color_primary_text_dark.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_green.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\color\\primary_text_dark.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_green.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_down.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/menu_note_edit.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_down.9.png"
+        "source": "net.micode.notes.app-main-6:/menu/note_edit.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_playground.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_middle.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\playground.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_middle.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_folder.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/raw-zh-rCN_introduction.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_folder.9.png"
+        "source": "net.micode.notes.app-main-6:/raw-zh-rCN/introduction"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_sub_folder.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_blue.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\sub_folder.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_blue.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_new_note_normal.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_add_account_text.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\new_note_normal.png"
+        "source": "net.micode.notes.app-main-6:/layout/add_account_text.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_item.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_alert.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_item.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_alert.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_up.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_notification.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_up.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/notification.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_new_note_pressed.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/menu_note_list.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\new_note_pressed.png"
+        "source": "net.micode.notes.app-main-6:/menu/note_list.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_edit.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_single.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_edit.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_single.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\raw-zh-rCN_introduction.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_white.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\raw-zh-rCN\\introduction"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_white.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_middle.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_options.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_middle.9.png"
+        "source": "net.micode.notes.app-main-6:/menu/note_list_options.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_dialog_edit_text.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_white.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\dialog_edit_text.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_white.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_super.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_red.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_super.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_red.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_bg_btn_set_color.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/xml_widget_2x_info.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\bg_btn_set_color.png"
+        "source": "net.micode.notes.app-main-6:/xml/widget_2x_info.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_edit.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_white.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_edit.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_white.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_single.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_widget_2x.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_single.9.png"
+        "source": "net.micode.notes.app-main-6:/layout/widget_2x.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_list_dropdown.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/menu_call_record_folder.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_list_dropdown.xml"
+        "source": "net.micode.notes.app-main-6:/menu/call_record_folder.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_middle.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_large.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_middle.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_large.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_white.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/menu_call_note_edit.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_white.9.png"
+        "source": "net.micode.notes.app-main-6:/menu/call_note_edit.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_up.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_blue.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_up.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_blue.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_yellow.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_yellow.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_yellow.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_yellow.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_huiting.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_up.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\huiting.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_up.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_down.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_call_record.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_down.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/call_record.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_middle.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/xml_widget_4x_info.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_middle.9.png"
+        "source": "net.micode.notes.app-main-6:/xml/widget_4x_info.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_red.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_down.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_red.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_down.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_single.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_delete.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_single.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_delete.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_middle.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_red.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_middle.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_red.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_single.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/xml_preferences.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_single.9.png"
+        "source": "net.micode.notes.app-main-6:/xml/preferences.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable_new_note.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_selected.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable\\new_note.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/selected.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_search_result.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_yellow.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\search_result.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_yellow.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_list.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_up.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_list.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_up.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_middle.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_datetime_picker.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_middle.9.png"
+        "source": "net.micode.notes.app-main-6:/layout/datetime_picker.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_down.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/raw_introduction.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_down.9.png"
+        "source": "net.micode.notes.app-main-6:/raw/introduction"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_bg_color_btn_mask.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_settings_header.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\bg_color_btn_mask.png"
+        "source": "net.micode.notes.app-main-6:/layout/settings_header.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_widget_4x_info.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_blue.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\widget_4x_info.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_blue.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_datetime_picker.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_widget_4x.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\datetime_picker.xml"
+        "source": "net.micode.notes.app-main-6:/layout/widget_4x.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_large.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_middle.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_large.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_middle.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_up.9.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable_new_note.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_up.9.png"
+        "source": "net.micode.notes.app-main-6:/drawable/new_note.xml"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_blue.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_red.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_blue.png"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_red.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_preferences.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_single.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\preferences.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_single.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_searchable.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_folder.9.png.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\searchable.xml"
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_folder.9.png"
     },
     {
-        "merged": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_red.png.flat",
+        "merged": "net.micode.notes.app-merged_res-4:/layout_account_dialog_title.xml.flat",
-        "source": "C:\\Users\\陈\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_red.png"
+        "source": "net.micode.notes.app-main-6:/layout/account_dialog_title.xml"
     }
 ]

src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list.xml

@@ -18,8 +18,8 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_height="fill_parent"
-    <!--android:background="@drawable/list_background"  -->
+    android:background="@drawable/list_background">
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -50,9 +50,9 @@
 
     <Button
         android:id="@+id/btn_new_note"
-        android:layout_width="match_parent"
-        android:layout_height="135dp"
-        android:layout_gravity="bottom"
         android:background="@drawable/new_note"
-        android:focusable="false" />
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="false"
+        android:layout_gravity="bottom" />
 </FrameLayout>

src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml

@@ -49,4 +49,12 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+
+    <item
+        android:id="@+id/menu_secret"
+        android:title="@string/menu_secret"/>
+
+    <item
+        android:id="@+id/menu_quit_secret"
+        android:title="@string/menu_quit_secret"/>
 </menu>

src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml

@@ -36,13 +36,12 @@
     <item
         android:id="@+id/menu_search"
         android:title="@string/menu_search"/>
+
     <item
-        android:id="@+id/menu_lanyangyang"
+        android:id="@+id/menu_secret"
-        android:title="@string/menu_lanyangyang"/>
+        android:title="@string/menu_secret"/>
-    <item
+
-        android:id="@+id/menu_grass"
-        android:title="@string/menu_grass"/>
     <item
-        android:id="@+id/menu_playground1"
+        android:id="@+id/menu_quit_secret"
-        android:title="@string/menu_playground1"/>
+        android:title="@string/menu_quit_secret"/>
 </menu>

src/Notes-master1/app/build/intermediates/packaged_res/debug/values/values.xml

@@ -65,15 +65,14 @@
     <string name="menu_font_size">Font size</string>
     <string name="menu_font_small">Small</string>
     <string name="menu_font_super">Super</string>
-    <string name="menu_grass">Background:grass</string>
-    <string name="menu_lanyangyang">Background:lanyangyang</string>
     <string name="menu_list_mode">Enter check list</string>
     <string name="menu_move">Move to folder</string>
     <string name="menu_move_parent_folder">Parent folder</string>
     <string name="menu_normal_mode">Leave check list</string>
-    <string name="menu_playground1">Background:playground1</string>
+    <string name="menu_quit_secret">退出私密模式</string>
     <string name="menu_remove_remind">Delete reminder</string>
     <string name="menu_search">Search</string>
+    <string name="menu_secret">私密模式</string>
     <string name="menu_select_all">Select all</string>
     <string name="menu_select_none">Nothing selected, the operation is invalid</string>
     <string name="menu_select_title">%d selected</string>

src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt

@@ -29,54 +29,51 @@ int drawable font_normal 0x7f040011
 int drawable font_size_selector_bg 0x7f040012
 int drawable font_small 0x7f040013
 int drawable font_super 0x7f040014
-int drawable grass 0x7f040015
+int drawable icon_app 0x7f040015
-int drawable icon_app 0x7f040016
+int drawable list_background 0x7f040016
-int drawable lanyangyang 0x7f040017
+int drawable list_blue_down 0x7f040017
-int drawable list_background 0x7f040018
+int drawable list_blue_middle 0x7f040018
-int drawable list_blue_down 0x7f040019
+int drawable list_blue_single 0x7f040019
-int drawable list_blue_middle 0x7f04001a
+int drawable list_blue_up 0x7f04001a
-int drawable list_blue_single 0x7f04001b
+int drawable list_folder 0x7f04001b
-int drawable list_blue_up 0x7f04001c
+int drawable list_footer_bg 0x7f04001c
-int drawable list_folder 0x7f04001d
+int drawable list_green_down 0x7f04001d
-int drawable list_footer_bg 0x7f04001e
+int drawable list_green_middle 0x7f04001e
-int drawable list_green_down 0x7f04001f
+int drawable list_green_single 0x7f04001f
-int drawable list_green_middle 0x7f040020
+int drawable list_green_up 0x7f040020
-int drawable list_green_single 0x7f040021
+int drawable list_red_down 0x7f040021
-int drawable list_green_up 0x7f040022
+int drawable list_red_middle 0x7f040022
-int drawable list_red_down 0x7f040023
+int drawable list_red_single 0x7f040023
-int drawable list_red_middle 0x7f040024
+int drawable list_red_up 0x7f040024
-int drawable list_red_single 0x7f040025
+int drawable list_white_down 0x7f040025
-int drawable list_red_up 0x7f040026
+int drawable list_white_middle 0x7f040026
-int drawable list_white_down 0x7f040027
+int drawable list_white_single 0x7f040027
-int drawable list_white_middle 0x7f040028
+int drawable list_white_up 0x7f040028
-int drawable list_white_single 0x7f040029
+int drawable list_yellow_down 0x7f040029
-int drawable list_white_up 0x7f04002a
+int drawable list_yellow_middle 0x7f04002a
-int drawable list_yellow_down 0x7f04002b
+int drawable list_yellow_single 0x7f04002b
-int drawable list_yellow_middle 0x7f04002c
+int drawable list_yellow_up 0x7f04002c
-int drawable list_yellow_single 0x7f04002d
+int drawable menu_delete 0x7f04002d
-int drawable list_yellow_up 0x7f04002e
+int drawable menu_move 0x7f04002e
-int drawable menu_delete 0x7f04002f
+int drawable new_note 0x7f04002f
-int drawable menu_move 0x7f040030
+int drawable new_note_normal 0x7f040030
-int drawable new_note 0x7f040031
+int drawable new_note_pressed 0x7f040031
-int drawable new_note_normal 0x7f040032
+int drawable note_edit_color_selector_panel 0x7f040032
-int drawable new_note_pressed 0x7f040033
+int drawable notification 0x7f040033
-int drawable note_edit_color_selector_panel 0x7f040034
+int drawable search_result 0x7f040034
-int drawable notification 0x7f040035
+int drawable selected 0x7f040035
-int drawable playground1 0x7f040036
+int drawable title_alert 0x7f040036
-int drawable search_result 0x7f040037
+int drawable title_bar_bg 0x7f040037
-int drawable selected 0x7f040038
+int drawable widget_2x_blue 0x7f040038
-int drawable title_alert 0x7f040039
+int drawable widget_2x_green 0x7f040039
-int drawable title_bar_bg 0x7f04003a
+int drawable widget_2x_red 0x7f04003a
-int drawable widget_2x_blue 0x7f04003b
+int drawable widget_2x_white 0x7f04003b
-int drawable widget_2x_green 0x7f04003c
+int drawable widget_2x_yellow 0x7f04003c
-int drawable widget_2x_red 0x7f04003d
+int drawable widget_4x_blue 0x7f04003d
-int drawable widget_2x_white 0x7f04003e
+int drawable widget_4x_green 0x7f04003e
-int drawable widget_2x_yellow 0x7f04003f
+int drawable widget_4x_red 0x7f04003f
-int drawable widget_4x_blue 0x7f040040
+int drawable widget_4x_white 0x7f040040
-int drawable widget_4x_green 0x7f040041
+int drawable widget_4x_yellow 0x7f040041
-int drawable widget_4x_red 0x7f040042
-int drawable widget_4x_white 0x7f040043
-int drawable widget_4x_yellow 0x7f040044
 int id account_dialog_subtitle 0x7f050000
 int id account_dialog_title 0x7f050001
 int id action_select_all 0x7f050002
@@ -114,39 +111,38 @@ int id menu_delete 0x7f050021
 int id menu_delete_remind 0x7f050022
 int id menu_export_text 0x7f050023
 int id menu_font_size 0x7f050024
-int id menu_grass 0x7f050025
+int id menu_list_mode 0x7f050025
-int id menu_lanyangyang 0x7f050026
+int id menu_new_folder 0x7f050026
-int id menu_list_mode 0x7f050027
+int id menu_new_note 0x7f050027
-int id menu_new_folder 0x7f050028
+int id menu_quit_secret 0x7f050028
-int id menu_new_note 0x7f050029
+int id menu_search 0x7f050029
-int id menu_playground1 0x7f05002a
+int id menu_secret 0x7f05002a
-int id menu_search 0x7f05002b
+int id menu_send_to_desktop 0x7f05002b
-int id menu_send_to_desktop 0x7f05002c
+int id menu_setting 0x7f05002c
-int id menu_setting 0x7f05002d
+int id menu_share 0x7f05002d
-int id menu_share 0x7f05002e
+int id menu_sync 0x7f05002e
-int id menu_sync 0x7f05002f
+int id minute 0x7f05002f
-int id minute 0x7f050030
+int id move 0x7f050030
-int id move 0x7f050031
+int id navigation_bar 0x7f050031
-int id navigation_bar 0x7f050032
+int id note_bg_color_selector 0x7f050032
-int id note_bg_color_selector 0x7f050033
+int id note_edit_list 0x7f050033
-int id note_edit_list 0x7f050034
+int id note_edit_view 0x7f050034
-int id note_edit_view 0x7f050035
+int id note_item 0x7f050035
-int id note_item 0x7f050036
+int id note_title 0x7f050036
-int id note_title 0x7f050037
+int id notes_list 0x7f050037
-int id notes_list 0x7f050038
+int id prefenerece_sync_status_textview 0x7f050038
-int id prefenerece_sync_status_textview 0x7f050039
+int id preference_sync_button 0x7f050039
-int id preference_sync_button 0x7f05003a
+int id selection_menu 0x7f05003a
-int id selection_menu 0x7f05003b
+int id sv_note_edit 0x7f05003b
-int id sv_note_edit 0x7f05003c
+int id tv_alert_date 0x7f05003c
-int id tv_alert_date 0x7f05003d
+int id tv_folder_name 0x7f05003d
-int id tv_folder_name 0x7f05003e
+int id tv_modified_date 0x7f05003e
-int id tv_modified_date 0x7f05003f
+int id tv_name 0x7f05003f
-int id tv_name 0x7f050040
+int id tv_time 0x7f050040
-int id tv_time 0x7f050041
+int id tv_title 0x7f050041
-int id tv_title 0x7f050042
+int id tv_title_bar 0x7f050042
-int id tv_title_bar 0x7f050043
+int id widget_bg_image 0x7f050043
-int id widget_bg_image 0x7f050044
+int id widget_text 0x7f050044
-int id widget_text 0x7f050045
 int layout account_dialog_title 0x7f060000
 int layout add_account_text 0x7f060001
 int layout datetime_picker 0x7f060002
@@ -214,67 +210,66 @@ int string menu_font_normal 0x7f0a0028
 int string menu_font_size 0x7f0a0029
 int string menu_font_small 0x7f0a002a
 int string menu_font_super 0x7f0a002b
-int string menu_grass 0x7f0a002c
+int string menu_list_mode 0x7f0a002c
-int string menu_lanyangyang 0x7f0a002d
+int string menu_move 0x7f0a002d
-int string menu_list_mode 0x7f0a002e
+int string menu_move_parent_folder 0x7f0a002e
-int string menu_move 0x7f0a002f
+int string menu_normal_mode 0x7f0a002f
-int string menu_move_parent_folder 0x7f0a0030
+int string menu_quit_secret 0x7f0a0030
-int string menu_normal_mode 0x7f0a0031
+int string menu_remove_remind 0x7f0a0031
-int string menu_playground1 0x7f0a0032
+int string menu_search 0x7f0a0032
-int string menu_remove_remind 0x7f0a0033
+int string menu_secret 0x7f0a0033
-int string menu_search 0x7f0a0034
+int string menu_select_all 0x7f0a0034
-int string menu_select_all 0x7f0a0035
+int string menu_select_none 0x7f0a0035
-int string menu_select_none 0x7f0a0036
+int string menu_select_title 0x7f0a0036
-int string menu_select_title 0x7f0a0037
+int string menu_send_to_desktop 0x7f0a0037
-int string menu_send_to_desktop 0x7f0a0038
+int string menu_setting 0x7f0a0038
-int string menu_setting 0x7f0a0039
+int string menu_share 0x7f0a0039
-int string menu_share 0x7f0a003a
+int string menu_sync 0x7f0a003a
-int string menu_sync 0x7f0a003b
+int string menu_sync_cancel 0x7f0a003b
-int string menu_sync_cancel 0x7f0a003c
+int string menu_title_select_folder 0x7f0a003c
-int string menu_title_select_folder 0x7f0a003d
+int string note_alert_expired 0x7f0a003d
-int string note_alert_expired 0x7f0a003e
+int string note_link_email 0x7f0a003e
-int string note_link_email 0x7f0a003f
+int string note_link_other 0x7f0a003f
-int string note_link_other 0x7f0a0040
+int string note_link_tel 0x7f0a0040
-int string note_link_tel 0x7f0a0041
+int string note_link_web 0x7f0a0041
-int string note_link_web 0x7f0a0042
+int string notealert_enter 0x7f0a0042
-int string notealert_enter 0x7f0a0043
+int string notealert_ok 0x7f0a0043
-int string notealert_ok 0x7f0a0044
+int string notelist_menu_new 0x7f0a0044
-int string notelist_menu_new 0x7f0a0045
+int string notelist_string_info 0x7f0a0045
-int string notelist_string_info 0x7f0a0046
+int string preferences_account_summary 0x7f0a0046
-int string preferences_account_summary 0x7f0a0047
+int string preferences_account_title 0x7f0a0047
-int string preferences_account_title 0x7f0a0048
+int string preferences_add_account 0x7f0a0048
-int string preferences_add_account 0x7f0a0049
+int string preferences_bg_random_appear_title 0x7f0a0049
-int string preferences_bg_random_appear_title 0x7f0a004a
+int string preferences_button_sync_cancel 0x7f0a004a
-int string preferences_button_sync_cancel 0x7f0a004b
+int string preferences_button_sync_immediately 0x7f0a004b
-int string preferences_button_sync_immediately 0x7f0a004c
+int string preferences_dialog_change_account_title 0x7f0a004c
-int string preferences_dialog_change_account_title 0x7f0a004d
+int string preferences_dialog_change_account_warn_msg 0x7f0a004d
-int string preferences_dialog_change_account_warn_msg 0x7f0a004e
+int string preferences_dialog_select_account_tips 0x7f0a004e
-int string preferences_dialog_select_account_tips 0x7f0a004f
+int string preferences_dialog_select_account_title 0x7f0a004f
-int string preferences_dialog_select_account_title 0x7f0a0050
+int string preferences_last_sync_time 0x7f0a0050
-int string preferences_last_sync_time 0x7f0a0051
+int string preferences_last_sync_time_format 0x7f0a0051
-int string preferences_last_sync_time_format 0x7f0a0052
+int string preferences_menu_cancel 0x7f0a0052
-int string preferences_menu_cancel 0x7f0a0053
+int string preferences_menu_change_account 0x7f0a0053
-int string preferences_menu_change_account 0x7f0a0054
+int string preferences_menu_remove_account 0x7f0a0054
-int string preferences_menu_remove_account 0x7f0a0055
+int string preferences_title 0x7f0a0055
-int string preferences_title 0x7f0a0056
+int string preferences_toast_cannot_change_account 0x7f0a0056
-int string preferences_toast_cannot_change_account 0x7f0a0057
+int string preferences_toast_success_set_accout 0x7f0a0057
-int string preferences_toast_success_set_accout 0x7f0a0058
+int string search 0x7f0a0058
-int string search 0x7f0a0059
+int string search_hint 0x7f0a0059
-int string search_hint 0x7f0a005a
+int string search_label 0x7f0a005a
-int string search_label 0x7f0a005b
+int string search_setting_description 0x7f0a005b
-int string search_setting_description 0x7f0a005c
+int string set_remind_time_message 0x7f0a005c
-int string set_remind_time_message 0x7f0a005d
+int string success_sdcard_export 0x7f0a005d
-int string success_sdcard_export 0x7f0a005e
+int string success_sync_account 0x7f0a005e
-int string success_sync_account 0x7f0a005f
+int string sync_progress_init_list 0x7f0a005f
-int string sync_progress_init_list 0x7f0a0060
+int string sync_progress_login 0x7f0a0060
-int string sync_progress_login 0x7f0a0061
+int string sync_progress_syncing 0x7f0a0061
-int string sync_progress_syncing 0x7f0a0062
+int string ticker_cancel 0x7f0a0062
-int string ticker_cancel 0x7f0a0063
+int string ticker_fail 0x7f0a0063
-int string ticker_fail 0x7f0a0064
+int string ticker_success 0x7f0a0064
-int string ticker_success 0x7f0a0065
+int string ticker_syncing 0x7f0a0065
-int string ticker_syncing 0x7f0a0066
+int string widget_havenot_content 0x7f0a0066
-int string widget_havenot_content 0x7f0a0067
+int string widget_under_visit_mode 0x7f0a0067
-int string widget_under_visit_mode 0x7f0a0068
 int style HighlightTextAppearancePrimary 0x7f0b0000
 int style HighlightTextAppearanceSecondary 0x7f0b0001
 int style NoteActionBarStyle 0x7f0b0002

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

@@ -1,7 +1,7 @@
-net.micode.notes.app-pngs-0 D:\anzhuo studio\2\Notes-master1\app\build\generated\res\pngs\debug
+net.micode.notes.app-pngs-0 D:\anzhuo studio\2\Notes-master2\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 D:\anzhuo studio\2\Notes-master1\app\build\generated\res\resValues\debug
+net.micode.notes.app-resValues-1 D:\anzhuo studio\2\Notes-master2\app\build\generated\res\resValues\debug
-net.micode.notes.app-packageDebugResources-2 D:\anzhuo studio\2\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
+net.micode.notes.app-packageDebugResources-2 D:\anzhuo studio\2\Notes-master2\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
-net.micode.notes.app-packageDebugResources-3 D:\anzhuo studio\2\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir
+net.micode.notes.app-packageDebugResources-3 D:\anzhuo studio\2\Notes-master2\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir
-net.micode.notes.app-merged_res-4 D:\anzhuo studio\2\Notes-master1\app\build\intermediates\merged_res\debug
+net.micode.notes.app-merged_res-4 D:\anzhuo studio\2\Notes-master2\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-5 D:\anzhuo studio\2\Notes-master1\app\src\debug\res
+net.micode.notes.app-debug-5 D:\anzhuo studio\2\Notes-master2\app\src\debug\res
-net.micode.notes.app-main-6 D:\anzhuo studio\2\Notes-master1\app\src\main\res
+net.micode.notes.app-main-6 D:\anzhuo studio\2\Notes-master2\app\src\main\res

src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt

@@ -6,287 +6,282 @@ net.micode.notes:xml/widget_2x_info = 0x7f0c0002
 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
 net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
 net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
-net.micode.notes:string/widget_under_visit_mode = 0x7f0a0068
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a0067
-net.micode.notes:string/sync_progress_login = 0x7f0a0061
+net.micode.notes:string/sync_progress_login = 0x7f0a0060
-net.micode.notes:string/success_sync_account = 0x7f0a005f
+net.micode.notes:string/success_sync_account = 0x7f0a005e
-net.micode.notes:string/search_setting_description = 0x7f0a005c
+net.micode.notes:string/search_setting_description = 0x7f0a005b
-net.micode.notes:string/search_hint = 0x7f0a005a
+net.micode.notes:string/search_hint = 0x7f0a0059
-net.micode.notes:string/search = 0x7f0a0059
+net.micode.notes:string/search = 0x7f0a0058
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0058
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0057
-net.micode.notes:string/preferences_title = 0x7f0a0056
+net.micode.notes:string/preferences_title = 0x7f0a0055
-net.micode.notes:string/preferences_menu_change_account = 0x7f0a0054
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0053
-net.micode.notes:string/preferences_last_sync_time = 0x7f0a0051
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a0050
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004d
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004c
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004a
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0049
-net.micode.notes:string/preferences_add_account = 0x7f0a0049
+net.micode.notes:string/preferences_add_account = 0x7f0a0048
-net.micode.notes:string/preferences_account_title = 0x7f0a0048
+net.micode.notes:string/preferences_account_title = 0x7f0a0047
 net.micode.notes:xml/widget_4x_info = 0x7f0c0003
-net.micode.notes:string/set_remind_time_message = 0x7f0a005d
+net.micode.notes:string/set_remind_time_message = 0x7f0a005c
-net.micode.notes:string/notealert_enter = 0x7f0a0043
+net.micode.notes:string/notealert_enter = 0x7f0a0042
-net.micode.notes:string/note_link_web = 0x7f0a0042
+net.micode.notes:string/note_link_web = 0x7f0a0041
-net.micode.notes:string/note_link_tel = 0x7f0a0041
+net.micode.notes:string/note_link_tel = 0x7f0a0040
-net.micode.notes:string/note_link_other = 0x7f0a0040
+net.micode.notes:string/note_link_other = 0x7f0a003f
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004e
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004d
-net.micode.notes:string/note_link_email = 0x7f0a003f
+net.micode.notes:string/note_link_email = 0x7f0a003e
-net.micode.notes:string/note_alert_expired = 0x7f0a003e
+net.micode.notes:string/note_alert_expired = 0x7f0a003d
-net.micode.notes:string/menu_sync_cancel = 0x7f0a003c
+net.micode.notes:string/menu_sync_cancel = 0x7f0a003b
-net.micode.notes:string/menu_sync = 0x7f0a003b
+net.micode.notes:string/menu_sync = 0x7f0a003a
-net.micode.notes:string/menu_share = 0x7f0a003a
+net.micode.notes:string/menu_share = 0x7f0a0039
-net.micode.notes:string/menu_setting = 0x7f0a0039
+net.micode.notes:string/menu_setting = 0x7f0a0038
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0038
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a0037
-net.micode.notes:string/menu_select_title = 0x7f0a0037
+net.micode.notes:string/menu_select_title = 0x7f0a0036
 net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
-net.micode.notes:string/menu_select_all = 0x7f0a0035
+net.micode.notes:string/menu_select_all = 0x7f0a0034
-net.micode.notes:string/menu_search = 0x7f0a0034
+net.micode.notes:string/menu_search = 0x7f0a0032
-net.micode.notes:string/menu_normal_mode = 0x7f0a0031
+net.micode.notes:string/menu_normal_mode = 0x7f0a002f
 net.micode.notes:string/menu_font_size = 0x7f0a0029
 net.micode.notes:string/menu_font_small = 0x7f0a002a
 net.micode.notes:string/menu_font_normal = 0x7f0a0028
-net.micode.notes:string/menu_remove_remind = 0x7f0a0033
+net.micode.notes:string/menu_remove_remind = 0x7f0a0031
 net.micode.notes:string/menu_font_large = 0x7f0a0027
 net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
 net.micode.notes:string/menu_export_text = 0x7f0a0023
 net.micode.notes:string/menu_deselect_all = 0x7f0a0022
 net.micode.notes:string/menu_create_folder = 0x7f0a0020
 net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
-net.micode.notes:string/success_sdcard_export = 0x7f0a005e
+net.micode.notes:string/success_sdcard_export = 0x7f0a005d
 net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
-net.micode.notes:string/format_folder_files_count = 0x7f0a001b
+net.micode.notes:string/preferences_account_summary = 0x7f0a0046
-net.micode.notes:string/format_exported_file_location = 0x7f0a001a
+net.micode.notes:string/format_date_ymd = 0x7f0a0018
-net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
 net.micode.notes:string/file_name_txt_format = 0x7f0a0015
-net.micode.notes:id/note_edit_list = 0x7f050034
+net.micode.notes:id/note_edit_list = 0x7f050033
-net.micode.notes:drawable/new_note = 0x7f040031
+net.micode.notes:drawable/new_note = 0x7f04002f
 net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:string/menu_select_none = 0x7f0a0036
+net.micode.notes:string/menu_select_none = 0x7f0a0035
+net.micode.notes:id/menu_secret = 0x7f05002a
 net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:string/ticker_cancel = 0x7f0a0063
+net.micode.notes:string/ticker_cancel = 0x7f0a0062
-net.micode.notes:drawable/list_red_single = 0x7f040025
+net.micode.notes:drawable/list_red_single = 0x7f040023
 net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
 net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
-net.micode.notes:drawable/widget_4x_green = 0x7f040041
+net.micode.notes:drawable/widget_4x_green = 0x7f04003e
 net.micode.notes:string/error_sdcard_export = 0x7f0a000f
-net.micode.notes:string/notealert_ok = 0x7f0a0044
+net.micode.notes:string/notealert_ok = 0x7f0a0043
-net.micode.notes:string/menu_move_parent_folder = 0x7f0a0030
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
-net.micode.notes:id/tv_title = 0x7f050042
+net.micode.notes:id/tv_title = 0x7f050041
 net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
 net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0055
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0054
 net.micode.notes:string/button_delete = 0x7f0a0007
-net.micode.notes:string/ticker_fail = 0x7f0a0064
+net.micode.notes:string/ticker_fail = 0x7f0a0063
-net.micode.notes:string/search_label = 0x7f0a005b
+net.micode.notes:string/search_label = 0x7f0a005a
-net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004f
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004e
 net.micode.notes:string/app_widget2x2 = 0x7f0a0005
+net.micode.notes:id/menu_quit_secret = 0x7f050028
 net.micode.notes:string/app_name = 0x7f0a0004
-net.micode.notes:string/widget_havenot_content = 0x7f0a0067
+net.micode.notes:string/widget_havenot_content = 0x7f0a0066
 net.micode.notes:string/alert_title_delete = 0x7f0a0003
 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
+net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
 net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
 net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
 net.micode.notes:layout/note_item = 0x7f060007
 net.micode.notes:menu/sub_folder = 0x7f070006
 net.micode.notes:menu/note_list = 0x7f070003
-net.micode.notes:string/ticker_syncing = 0x7f0a0066
+net.micode.notes:string/ticker_syncing = 0x7f0a0065
-net.micode.notes:drawable/menu_move = 0x7f040030
+net.micode.notes:drawable/menu_move = 0x7f04002e
-net.micode.notes:id/menu_search = 0x7f05002b
+net.micode.notes:id/menu_search = 0x7f050029
 net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
 net.micode.notes:raw/introduction = 0x7f090000
 net.micode.notes:menu/call_record_folder = 0x7f070001
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0052
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0051
 net.micode.notes:menu/call_note_edit = 0x7f070000
-net.micode.notes:drawable/list_red_middle = 0x7f040024
+net.micode.notes:drawable/list_red_middle = 0x7f040022
 net.micode.notes:layout/widget_2x = 0x7f06000c
 net.micode.notes:layout/widget_4x = 0x7f06000d
-net.micode.notes:drawable/icon_app = 0x7f040016
+net.micode.notes:drawable/icon_app = 0x7f040015
 net.micode.notes:layout/note_list = 0x7f060008
 net.micode.notes:layout/note_edit = 0x7f060005
-net.micode.notes:drawable/list_background = 0x7f040018
+net.micode.notes:drawable/list_background = 0x7f040016
 net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
-net.micode.notes:drawable/widget_2x_blue = 0x7f04003b
+net.micode.notes:drawable/widget_2x_blue = 0x7f040038
 net.micode.notes:layout/folder_list_item = 0x7f060004
-net.micode.notes:string/sync_progress_init_list = 0x7f0a0060
+net.micode.notes:string/sync_progress_init_list = 0x7f0a005f
 net.micode.notes:id/btn_new_note = 0x7f050004
 net.micode.notes:layout/add_account_text = 0x7f060001
-net.micode.notes:id/widget_text = 0x7f050045
+net.micode.notes:id/widget_text = 0x7f050044
-net.micode.notes:id/widget_bg_image = 0x7f050044
+net.micode.notes:id/widget_bg_image = 0x7f050043
+net.micode.notes:string/menu_secret = 0x7f0a0033
 net.micode.notes:string/menu_folder_delete = 0x7f0a0025
-net.micode.notes:id/tv_name = 0x7f050040
+net.micode.notes:id/tv_name = 0x7f05003f
-net.micode.notes:id/tv_alert_date = 0x7f05003d
+net.micode.notes:id/account_dialog_title = 0x7f050001
+net.micode.notes:id/tv_folder_name = 0x7f05003d
+net.micode.notes:id/tv_alert_date = 0x7f05003c
 net.micode.notes:color/primary_text_dark = 0x7f020000
-net.micode.notes:id/tv_time = 0x7f050041
+net.micode.notes:id/tv_time = 0x7f050040
-net.micode.notes:id/selection_menu = 0x7f05003b
+net.micode.notes:id/selection_menu = 0x7f05003a
-net.micode.notes:id/preference_sync_button = 0x7f05003a
+net.micode.notes:id/preference_sync_button = 0x7f050039
 net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:id/notes_list = 0x7f050038
+net.micode.notes:id/notes_list = 0x7f050037
-net.micode.notes:drawable/playground1 = 0x7f040036
+net.micode.notes:id/note_title = 0x7f050036
-net.micode.notes:id/note_title = 0x7f050037
+net.micode.notes:string/format_exported_file_location = 0x7f0a001a
-net.micode.notes:id/note_bg_color_selector = 0x7f050033
+net.micode.notes:id/note_bg_color_selector = 0x7f050032
-net.micode.notes:id/navigation_bar = 0x7f050032
+net.micode.notes:id/navigation_bar = 0x7f050031
-net.micode.notes:id/move = 0x7f050031
+net.micode.notes:id/move = 0x7f050030
-net.micode.notes:id/menu_sync = 0x7f05002f
+net.micode.notes:id/menu_share = 0x7f05002d
-net.micode.notes:string/menu_move = 0x7f0a002f
+net.micode.notes:string/format_folder_files_count = 0x7f0a001b
+net.micode.notes:string/menu_move = 0x7f0a002d
 net.micode.notes:id/date = 0x7f050007
-net.micode.notes:id/note_item = 0x7f050036
+net.micode.notes:id/note_item = 0x7f050035
-net.micode.notes:id/menu_setting = 0x7f05002d
+net.micode.notes:id/menu_setting = 0x7f05002c
-net.micode.notes:id/menu_send_to_desktop = 0x7f05002c
+net.micode.notes:id/menu_send_to_desktop = 0x7f05002b
-net.micode.notes:id/menu_share = 0x7f05002e
+net.micode.notes:id/menu_sync = 0x7f05002e
-net.micode.notes:id/menu_playground1 = 0x7f05002a
 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
-net.micode.notes:id/menu_lanyangyang = 0x7f050026
+net.micode.notes:id/note_edit_view = 0x7f050034
-net.micode.notes:id/note_edit_view = 0x7f050035
+net.micode.notes:id/menu_list_mode = 0x7f050025
-net.micode.notes:id/menu_list_mode = 0x7f050027
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004f
-net.micode.notes:string/menu_lanyangyang = 0x7f0a002d
-net.micode.notes:id/account_dialog_title = 0x7f050001
-net.micode.notes:id/tv_folder_name = 0x7f05003e
-net.micode.notes:string/preferences_account_summary = 0x7f0a0047
-net.micode.notes:string/format_date_ymd = 0x7f0a0018
-net.micode.notes:id/menu_grass = 0x7f050025
-net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0050
 net.micode.notes:id/menu_font_size = 0x7f050024
-net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004b
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004a
 net.micode.notes:id/menu_alert = 0x7f050020
-net.micode.notes:string/menu_grass = 0x7f0a002c
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:id/ll_font_super = 0x7f05001f
 net.micode.notes:id/ll_font_small = 0x7f05001e
 net.micode.notes:string/error_note_not_exist = 0x7f0a000e
 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
-net.micode.notes:id/minute = 0x7f050030
+net.micode.notes:id/minute = 0x7f05002f
 net.micode.notes:id/ll_font_normal = 0x7f05001d
 net.micode.notes:id/ll_font_large = 0x7f05001c
-net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004c
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004b
-net.micode.notes:string/menu_playground1 = 0x7f0a0032
 net.micode.notes:id/iv_super_select = 0x7f05001b
-net.micode.notes:string/ticker_success = 0x7f0a0065
+net.micode.notes:string/ticker_success = 0x7f0a0064
 net.micode.notes:id/iv_medium_select = 0x7f050019
 net.micode.notes:id/iv_large_select = 0x7f050018
 net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
 net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
 net.micode.notes:id/iv_bg_yellow = 0x7f050016
-net.micode.notes:layout/account_dialog_title = 0x7f060000
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
-net.micode.notes:string/notelist_menu_new = 0x7f0a0045
+net.micode.notes:drawable/list_yellow_up = 0x7f04002c
-net.micode.notes:drawable/menu_delete = 0x7f04002f
+net.micode.notes:id/iv_bg_white = 0x7f050014
-net.micode.notes:id/iv_bg_red_select = 0x7f050013
-net.micode.notes:id/iv_bg_red = 0x7f050012
 net.micode.notes:menu/note_edit = 0x7f070002
-net.micode.notes:drawable/list_white_down = 0x7f040027
+net.micode.notes:drawable/list_white_down = 0x7f040025
-net.micode.notes:drawable/list_white_up = 0x7f04002a
+net.micode.notes:string/menu_quit_secret = 0x7f0a0030
+net.micode.notes:drawable/list_white_up = 0x7f040028
 net.micode.notes:id/iv_bg_green = 0x7f050010
 net.micode.notes:drawable/delete = 0x7f040004
 net.micode.notes:id/iv_bg_blue = 0x7f05000e
-net.micode.notes:drawable/list_green_single = 0x7f040021
+net.micode.notes:drawable/list_green_single = 0x7f04001f
 net.micode.notes:id/iv_alert_icon = 0x7f05000d
-net.micode.notes:drawable/list_yellow_single = 0x7f04002d
+net.micode.notes:drawable/list_yellow_single = 0x7f04002b
 net.micode.notes:id/cb_edit_item = 0x7f050006
 net.micode.notes:drawable/font_super = 0x7f040014
 net.micode.notes:drawable/edit_title_blue = 0x7f040009
 net.micode.notes:color/user_query_highlight = 0x7f020002
 net.micode.notes:id/font_size_selector = 0x7f05000b
-net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0057
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0056
 net.micode.notes:id/et_edit_text = 0x7f050009
-net.micode.notes:drawable/widget_2x_yellow = 0x7f04003f
+net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
 net.micode.notes:id/amPm = 0x7f050003
 net.micode.notes:id/account_dialog_subtitle = 0x7f050000
+net.micode.notes:id/menu_new_note = 0x7f050027
+net.micode.notes:id/iv_bg_green_select = 0x7f050011
+net.micode.notes:drawable/widget_2x_red = 0x7f04003a
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
 net.micode.notes:drawable/clock = 0x7f040003
 net.micode.notes:drawable/font_small = 0x7f040013
 net.micode.notes:id/btn_set_bg_color = 0x7f050005
 net.micode.notes:array/menu_share_ways = 0x7f010001
 net.micode.notes:style/NoteTheme = 0x7f0b0003
-net.micode.notes:drawable/notification = 0x7f040035
+net.micode.notes:drawable/notification = 0x7f040033
 net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
-net.micode.notes:string/menu_title_select_folder = 0x7f0a003d
+net.micode.notes:string/menu_title_select_folder = 0x7f0a003c
 net.micode.notes:string/hint_foler_name = 0x7f0a001d
-net.micode.notes:drawable/list_red_down = 0x7f040023
+net.micode.notes:drawable/list_red_down = 0x7f040021
 net.micode.notes:id/menu_delete = 0x7f050021
-net.micode.notes:drawable/lanyangyang = 0x7f040017
+net.micode.notes:drawable/widget_4x_blue = 0x7f04003d
-net.micode.notes:drawable/widget_4x_blue = 0x7f040040
 net.micode.notes:drawable/edit_title_white = 0x7f04000c
 net.micode.notes:string/menu_delete = 0x7f0a0021
-net.micode.notes:drawable/list_footer_bg = 0x7f04001e
+net.micode.notes:drawable/list_footer_bg = 0x7f04001c
 net.micode.notes:drawable/edit_red = 0x7f040008
-net.micode.notes:string/preferences_menu_cancel = 0x7f0a0053
+net.micode.notes:string/preferences_menu_cancel = 0x7f0a0052
-net.micode.notes:drawable/widget_2x_white = 0x7f04003e
+net.micode.notes:drawable/widget_2x_white = 0x7f04003b
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040044
-net.micode.notes:drawable/grass = 0x7f040015
-net.micode.notes:drawable/widget_2x_red = 0x7f04003d
 net.micode.notes:drawable/font_large = 0x7f040010
 net.micode.notes:string/file_path = 0x7f0a0016
 net.micode.notes:string/menu_alert = 0x7f0a001f
-net.micode.notes:drawable/title_alert = 0x7f040039
+net.micode.notes:drawable/title_alert = 0x7f040036
-net.micode.notes:drawable/list_green_down = 0x7f04001f
+net.micode.notes:drawable/list_green_down = 0x7f04001d
 net.micode.notes:string/error_sync_internal = 0x7f0a0012
-net.micode.notes:drawable/search_result = 0x7f040037
+net.micode.notes:drawable/search_result = 0x7f040034
 net.micode.notes:string/app_widget4x4 = 0x7f0a0006
-net.micode.notes:drawable/title_bar_bg = 0x7f04003a
+net.micode.notes:drawable/title_bar_bg = 0x7f040037
-net.micode.notes:drawable/selected = 0x7f040038
+net.micode.notes:drawable/selected = 0x7f040035
 net.micode.notes:plurals/search_results_title = 0x7f080000
 net.micode.notes:drawable/edit_title_green = 0x7f04000a
-net.micode.notes:drawable/new_note_normal = 0x7f040032
+net.micode.notes:drawable/new_note_normal = 0x7f040030
 net.micode.notes:drawable/edit_white = 0x7f04000e
-net.micode.notes:drawable/widget_2x_green = 0x7f04003c
+net.micode.notes:drawable/widget_2x_green = 0x7f040039
-net.micode.notes:id/iv_bg_white = 0x7f050014
+net.micode.notes:id/iv_bg_red = 0x7f050012
-net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+net.micode.notes:drawable/list_white_single = 0x7f040027
-net.micode.notes:drawable/list_yellow_up = 0x7f04002e
-net.micode.notes:drawable/list_white_single = 0x7f040029
-net.micode.notes:menu/note_list_dropdown = 0x7f070004
-net.micode.notes:drawable/edit_title_red = 0x7f04000b
-net.micode.notes:id/tv_title_bar = 0x7f050043
-net.micode.notes:drawable/list_red_up = 0x7f040026
 net.micode.notes:id/delete = 0x7f050008
 net.micode.notes:layout/note_edit_list_item = 0x7f060006
 net.micode.notes:string/call_record_folder_name = 0x7f0a0008
-net.micode.notes:drawable/list_green_up = 0x7f040022
+net.micode.notes:drawable/list_green_up = 0x7f040020
-net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050039
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050038
 net.micode.notes:id/et_foler_name = 0x7f05000a
 net.micode.notes:id/menu_delete_remind = 0x7f050022
-net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040034
+net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032
 net.micode.notes:id/menu_export_text = 0x7f050023
 net.micode.notes:id/hour = 0x7f05000c
 net.micode.notes:string/menu_folder_view = 0x7f0a0026
 net.micode.notes:drawable/dropdown_icon = 0x7f040005
-net.micode.notes:string/notelist_string_info = 0x7f0a0046
+net.micode.notes:string/notelist_string_info = 0x7f0a0045
-net.micode.notes:drawable/list_blue_single = 0x7f04001b
+net.micode.notes:drawable/list_blue_single = 0x7f040019
-net.micode.notes:drawable/list_white_middle = 0x7f040028
+net.micode.notes:drawable/list_white_middle = 0x7f040026
+net.micode.notes:id/tv_title_bar = 0x7f050042
+net.micode.notes:drawable/edit_title_red = 0x7f04000b
 net.micode.notes:dimen/text_font_size_normal = 0x7f030002
 net.micode.notes:layout/dialog_edit_text = 0x7f060003
 net.micode.notes:color/secondary_text_dark = 0x7f020001
-net.micode.notes:drawable/list_folder = 0x7f04001d
+net.micode.notes:drawable/list_folder = 0x7f04001b
-net.micode.notes:id/iv_bg_green_select = 0x7f050011
+net.micode.notes:drawable/list_green_middle = 0x7f04001e
-net.micode.notes:id/menu_new_note = 0x7f050029
+net.micode.notes:string/sync_progress_syncing = 0x7f0a0061
-net.micode.notes:drawable/list_green_middle = 0x7f040020
-net.micode.notes:string/sync_progress_syncing = 0x7f0a0062
 net.micode.notes:drawable/font_normal = 0x7f040011
-net.micode.notes:drawable/list_blue_up = 0x7f04001c
+net.micode.notes:drawable/list_blue_up = 0x7f04001a
 net.micode.notes:id/iv_small_select = 0x7f05001a
-net.micode.notes:drawable/list_blue_down = 0x7f040019
+net.micode.notes:drawable/list_blue_down = 0x7f040017
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:dimen/text_font_size_large = 0x7f030000
 net.micode.notes:drawable/edit_yellow = 0x7f04000f
-net.micode.notes:drawable/list_yellow_down = 0x7f04002b
+net.micode.notes:drawable/list_yellow_down = 0x7f040029
 net.micode.notes:dimen/text_font_size_super = 0x7f030004
 net.micode.notes:drawable/edit_blue = 0x7f040006
 net.micode.notes:array/format_for_exported_note = 0x7f010000
-net.micode.notes:string/menu_list_mode = 0x7f0a002e
+net.micode.notes:string/menu_list_mode = 0x7f0a002c
-net.micode.notes:drawable/list_yellow_middle = 0x7f04002c
+net.micode.notes:drawable/list_yellow_middle = 0x7f04002a
-net.micode.notes:drawable/list_blue_middle = 0x7f04001a
+net.micode.notes:drawable/list_blue_middle = 0x7f040018
 net.micode.notes:dimen/text_font_size_medium = 0x7f030001
-net.micode.notes:drawable/new_note_pressed = 0x7f040033
+net.micode.notes:drawable/new_note_pressed = 0x7f040031
-net.micode.notes:id/menu_new_folder = 0x7f050028
+net.micode.notes:id/menu_new_folder = 0x7f050026
-net.micode.notes:id/sv_note_edit = 0x7f05003c
+net.micode.notes:id/sv_note_edit = 0x7f05003b
 net.micode.notes:drawable/call_record = 0x7f040002
 net.micode.notes:drawable/edit_green = 0x7f040007
 net.micode.notes:id/action_select_all = 0x7f050002
-net.micode.notes:id/tv_modified_date = 0x7f05003f
+net.micode.notes:id/tv_modified_date = 0x7f05003e
 net.micode.notes:id/iv_bg_white_select = 0x7f050015
 net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
 net.micode.notes:layout/note_list_footer = 0x7f06000a
 net.micode.notes:string/menu_font_super = 0x7f0a002b
-net.micode.notes:drawable/widget_4x_red = 0x7f040042
+net.micode.notes:drawable/widget_4x_red = 0x7f04003f
+net.micode.notes:layout/account_dialog_title = 0x7f060000
+net.micode.notes:string/notelist_menu_new = 0x7f0a0044
+net.micode.notes:drawable/menu_delete = 0x7f04002d
+net.micode.notes:id/iv_bg_red_select = 0x7f050013
+net.micode.notes:menu/note_list_dropdown = 0x7f070004
+net.micode.notes:drawable/list_red_up = 0x7f040024
 net.micode.notes:layout/settings_header = 0x7f06000b
 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
 net.micode.notes:dimen/text_font_size_small = 0x7f030003
 net.micode.notes:layout/datetime_picker = 0x7f060002
 net.micode.notes:menu/note_list_options = 0x7f070005
-net.micode.notes:drawable/widget_4x_white = 0x7f040043
+net.micode.notes:drawable/widget_4x_white = 0x7f040040

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

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

src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java

@@ -24,12 +24,6 @@ import android.os.Bundle;
 import android.os.IBinder;
 
 public class GTaskSyncService extends Service {
-    /*
-    跟”同步“（包名称）功能对应的类GTaskSyncService的定义
-    下面定义的静态常量分别表示动作类型的字符串名称、开始同步的动作类型、取消同步的动作类型、无效的动作类型、GTask服务的广播名称、GTask服务的广播是否正在同步、GTask服务的广播进度消息
-     还有两个静态变量mSyncTask和mSyncProgress，在最后两个，分别表示同步任务和同步进度
-
-     */
     public final static String ACTION_STRING_NAME = "sync_action_type";
 
     public final static int ACTION_START_SYNC = 0;
@@ -48,7 +42,7 @@ public class GTaskSyncService extends Service {
 
     private static String mSyncProgress = "";
 
-    private void startSync() {//用于开始同步任务，如果当前没有同步任务，则创建一个新的GTaskASyncTask实例，并在同步完成后发送广播并停止Service
+    private void startSync() {
         if (mSyncTask == null) {
             mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
                 public void onComplete() {
@@ -62,19 +56,19 @@ public class GTaskSyncService extends Service {
         }
     }
 
-    private void cancelSync() {//用于取消同步任务，如果当前有同步任务，则取消同步
+    private void cancelSync() {
         if (mSyncTask != null) {
             mSyncTask.cancelSync();
         }
     }
 
     @Override
-    public void onCreate() {//在Service创建时将mSyncTask置为null
+    public void onCreate() {
         mSyncTask = null;
     }
 
     @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {//在接收到指定动作类型的Intent时执行相应的操作，包括开始同步和取消同步
+    public int onStartCommand(Intent intent, int flags, int startId) {
         Bundle bundle = intent.getExtras();
         if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) {
             switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) {
@@ -93,7 +87,7 @@ public class GTaskSyncService extends Service {
     }
 
     @Override
-    public void onLowMemory() {//方法在系统内存不足时取消同步任务
+    public void onLowMemory() {
         if (mSyncTask != null) {
             mSyncTask.cancelSync();
         }
@@ -103,7 +97,7 @@ public class GTaskSyncService extends Service {
         return null;
     }
 
-    public void sendBroadcast(String msg) {//用于发送广播，其中包括同步任务是否正在进行和同步进度消息
+    public void sendBroadcast(String msg) {
         mSyncProgress = msg;
         Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME);
         intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null);
@@ -111,7 +105,6 @@ public class GTaskSyncService extends Service {
         sendBroadcast(intent);
     }
 
-    //startSync()和cancelSync()方法分别用于在Activity和Context中开始和取消同步任务
     public static void startSync(Activity activity) {
         GTaskManager.getInstance().setActivityContext(activity);
         Intent intent = new Intent(activity, GTaskSyncService.class);
@@ -125,11 +118,11 @@ public class GTaskSyncService extends Service {
         context.startService(intent);
     }
 
-    public static boolean isSyncing() {//用于判断是否有同步任务正在进行
+    public static boolean isSyncing() {
         return mSyncTask != null;
     }
 
-    public static String getProgressString() {//用于获取同步进度消息
+    public static String getProgressString() {
         return mSyncProgress;
     }
 }

src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java

@@ -35,14 +35,14 @@ import java.util.ArrayList;
 
 
 public class Note {
-    private ContentValues mNoteDiffValues;// 存储笔记变更的内容值
+    private ContentValues mNoteDiffValues;
-    private NoteData mNoteData;// 笔记数据
+    private NoteData mNoteData;
-    private static final String TAG = "Note";// 日志标签
+    private static final String TAG = "Note";
     /**
-     * Create a new note id for adding a new note to databases为将新笔记添加到数据库中创建一个新的笔记ID
+     * Create a new note id for adding a new note to databases
      */
     public static synchronized long getNewNoteId(Context context, long folderId) {
-        // Create a new note in the database在数据库中创建一个新的笔记
+        // Create a new note in the database
         ContentValues values = new ContentValues();
         long createdTime = System.currentTimeMillis();
         values.put(NoteColumns.CREATED_DATE, createdTime);
@@ -113,14 +113,12 @@ public class Note {
          * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and
          * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the
          * note data info
-         * 理论上，一旦数据发生变化，笔记应该在{@link NoteColumns#LOCAL_MODIFIED}和{@link NoteColumns#MODIFIED_DATE}上更新。
-         * 为了数据安全，即使更新笔记失败，我们也会更新笔记数据信息
          */
         if (context.getContentResolver().update(
                 ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null,
                 null) == 0) {
             Log.e(TAG, "Update note error, should not happen");
-            // Do not return, fall through不要返回，继续执行
+            // Do not return, fall through
         }
         mNoteDiffValues.clear();
 
@@ -133,21 +131,16 @@ public class Note {
     }
 
     private class NoteData {
-        private long mTextDataId;// 文本数据ID
+        private long mTextDataId;
 
-        private ContentValues mTextDataValues;// 文本数据内容值
+        private ContentValues mTextDataValues;
 
-        private long mCallDataId;// 通话数据ID
+        private long mCallDataId;
 
-        private ContentValues mCallDataValues; // 通话数据内容值
+        private ContentValues mCallDataValues;
 
-        private static final String TAG = "NoteData"; // 日志标签
+        private static final String TAG = "NoteData";
 
-        /**
-         * 这是一个构造函数。
-         *在这个构造函数中，它初始化了两个成员变量 `mTextDataValues` 和 `mCallDataValues`，它们都是用来存储键值对的对象
-         *同时，它还初始化了两个 ID 变量 `mTextDataId` 和 `mCallDataId`。
-         */
         public NoteData() {
             mTextDataValues = new ContentValues();
             mCallDataValues = new ContentValues();
@@ -155,20 +148,10 @@ public class Note {
             mCallDataId = 0;
         }
 
-        /**
-         * 这是一个用来检查是否有本地修改的方法。
-         * 它通过检查 `mTextDataValues` 和 `mCallDataValues` 的大小来判断是否有本地修改。
-         * @return
-         */
         boolean isLocalModified() {
             return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;
         }
 
-        /**
-         * 这是一个设置文本数据 ID 的方法。
-         * 如果传入的 ID 小于等于 0，将会抛出一个异常。
-         * @param id
-         */
         void setTextDataId(long id) {
             if(id <= 0) {
                 throw new IllegalArgumentException("Text data id should larger than 0");
@@ -176,11 +159,6 @@ public class Note {
             mTextDataId = id;
         }
 
-        /**
-         * 这是一个设置通话数据 ID 的方法。
-         * 如果传入的 ID 小于等于 0，将会抛出一个异常。
-         * @param id
-         */
         void setCallDataId(long id) {
             if (id <= 0) {
                 throw new IllegalArgumentException("Call data id should larger than 0");
@@ -188,24 +166,12 @@ public class Note {
             mCallDataId = id;
         }
 
-        /**
-         * 这是一个设置通话数据的方法。
-         * 它将键值对存储到 `mCallDataValues` 中，并且更新了一些其他的笔记差异值
-         * @param key
-         * @param value
-         */
         void setCallData(String key, String value) {
             mCallDataValues.put(key, value);
             mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
             mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
         }
 
-        /**
-         * 这是一个设置文本数据的方法。
-         * 它将键值对存储到 `mTextDataValues` 中，并且更新了一些其他的笔记差异值。
-         * @param key
-         * @param value
-         */
         void setTextData(String key, String value) {
             mTextDataValues.put(key, value);
             mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
@@ -216,16 +182,16 @@ public class Note {
             /**
              * Check for safety
              */
-            if (noteId <= 0) {// 检查 noteId 是否合法
+            if (noteId <= 0) {
                 throw new IllegalArgumentException("Wrong note id:" + noteId);
             }
 
-            ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();// 创建一个操作列表
+            ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
             ContentProviderOperation.Builder builder = null;
 
-            if(mTextDataValues.size() > 0) {// 如果有文本数据
+            if(mTextDataValues.size() > 0) {
-                mTextDataValues.put(DataColumns.NOTE_ID, noteId);// 设置笔记 ID
+                mTextDataValues.put(DataColumns.NOTE_ID, noteId);
-                if (mTextDataId == 0) {// 如果文本数据 ID 为 0，表示需要插入新数据
+                if (mTextDataId == 0) {
                     mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);
                     Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
                             mTextDataValues);
@@ -236,7 +202,7 @@ public class Note {
                         mTextDataValues.clear();
                         return null;
                     }
-                } else {// 否则，表示需要更新数据
+                } else {
                     builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
                             Notes.CONTENT_DATA_URI, mTextDataId));
                     builder.withValues(mTextDataValues);
@@ -245,9 +211,9 @@ public class Note {
                 mTextDataValues.clear();
             }
 
-            if(mCallDataValues.size() > 0) { // 如果有通话数据
+            if(mCallDataValues.size() > 0) {
-                mCallDataValues.put(DataColumns.NOTE_ID, noteId); // 设置笔记 ID
+                mCallDataValues.put(DataColumns.NOTE_ID, noteId);
-                if (mCallDataId == 0) {// 如果通话数据 ID 为 0，表示需要插入新数据
+                if (mCallDataId == 0) {
                     mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE);
                     Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
                             mCallDataValues);
@@ -258,7 +224,7 @@ public class Note {
                         mCallDataValues.clear();
                         return null;
                     }
-                } else {// 否则，表示需要更新数据
+                } else {
                     builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
                             Notes.CONTENT_DATA_URI, mCallDataId));
                     builder.withValues(mCallDataValues);
@@ -268,7 +234,7 @@ public class Note {
             }
 
             if (operationList.size() > 0) {
-                try {// 应用操作列表到内容提供程序
+                try {
                     ContentProviderResult[] results = context.getContentResolver().applyBatch(
                             Notes.AUTHORITY, operationList);
                     return (results == null || results.length == 0 || results[0] == null) ? null
@@ -285,6 +251,3 @@ public class Note {
         }
     }
 }
-/**
- * 这个类定义了一个用于管理笔记数据的对象，
- */

src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java

@@ -13,10 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/**
+
- * 导入包和声明包名和版权声明：
- *    - 代码中导入了一些需要使用的类，以及声明了包名和版权信息。
- */
 package net.micode.notes.model;
 
 import android.appwidget.AppWidgetManager;
@@ -35,43 +32,36 @@ import net.micode.notes.data.Notes.TextNote;
 import net.micode.notes.tool.ResourceParser.NoteBgResources;
 
 
-/**
+public class WorkingNote {
- * 这段代码是一个工作笔记的类，用于管理笔记数据。
- */
-public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含了一些成员变量和方法。
     // Note for the working note
-    private Note mNote;//用于存储笔记对象
+    private Note mNote;
     // Note Id
-    private long mNoteId;//笔记的 ID
+    private long mNoteId;
     // Note content
-    private String mContent;//笔记的内容
+    private String mContent;
     // Note mode
-    private int mMode;//笔记的模式
+    private int mMode;
 
-    private long mAlertDate;//提醒日期
+    private long mAlertDate;
 
-    private long mModifiedDate;//最后修改日期
+    private long mModifiedDate;
 
-    private int mBgColorId;//背景颜色的 ID
+    private int mBgColorId;
 
-    private int mWidgetId;//小部件的 ID
+    private int mWidgetId;
 
-    private int mWidgetType;//小部件的类型
+    private int mWidgetType;
 
-    private long mFolderId;//文件夹的 ID
+    private long mFolderId;
 
-    private Context mContext;//上下文对象
+    private Context mContext;
 
     private static final String TAG = "WorkingNote";
 
-    private boolean mIsDeleted;//笔记是否被删除
+    private boolean mIsDeleted;
 
-    private NoteSettingChangedListener mNoteSettingStatusListener;//笔记设置状态的监听器
+    private NoteSettingChangedListener mNoteSettingStatusListener;
 
-    /**
-     * 数据查询相关的常量和数组：
-     * 定义了查询数据和笔记的投影（projection）和相关的列索引常量。
-     */
     public static final String[] DATA_PROJECTION = new String[] {
             DataColumns.ID,
             DataColumns.CONTENT,
@@ -125,14 +115,6 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
     }
 
     // Existing note construct
-
-    /**
-     * 构造方法：
-     *    - 有两个私有构造方法，一个是用于创建新笔记的，一个是用于加载现有笔记的
-     * @param context
-     * @param noteId
-     * @param folderId
-     */
     private WorkingNote(Context context, long noteId, long folderId) {
         mContext = context;
         mNoteId = noteId;
@@ -142,11 +124,6 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
         loadNote();
     }
 
-    /**
-     * `loadNote` 方法：
-     *  从数据库加载笔记的相关信息，
-     *  包括文件夹 ID、背景颜色、小部件 ID、小部件类型、提醒日期和最后修改日期。
-     */
     private void loadNote() {
         Cursor cursor = mContext.getContentResolver().query(
                 ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
@@ -169,10 +146,6 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
         loadNoteData();
     }
 
-    /**
-     * `loadNoteData` 方法：
-     *  从数据库加载笔记的具体数据，包括内容、模式等
-     */
     private void loadNoteData() {
         Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
                 DataColumns.NOTE_ID + "=?", new String[] {
@@ -201,7 +174,7 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
         }
     }
 
-    public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,//创建新笔记的私有构造方法
+    public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
             int widgetType, int defaultBgColorId) {
         WorkingNote note = new WorkingNote(context, folderId);
         note.setBgColorId(defaultBgColorId);
@@ -210,17 +183,10 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
         return note;
     }
 
-
+    public static WorkingNote load(Context context, long id) {
-    public static WorkingNote load(Context context, long id) {//这是一个静态方法，用于加载现有笔记。它返回一个WorkingNote对象。
         return new WorkingNote(context, id, 0);
     }
 
-    /**
-     * 下面这个方法用于保存笔记。
-     * 它首先调用`isWorthSaving()`方法来判断是否值得保存，然后根据情况执行保存操作。
-     * 如果存在与该笔记相关的小部件，并且设置状态监听器不为空，则调用小部件变更的回调方法。
-     * @return
-     */
     public synchronized boolean saveNote() {
         if (isWorthSaving()) {
             if (!existInDatabase()) {
@@ -246,11 +212,11 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
         }
     }
 
-    public boolean existInDatabase() {//这个方法用于判断笔记是否存在于数据库中
+    public boolean existInDatabase() {
         return mNoteId > 0;
     }
 
-    private boolean isWorthSaving() {//这个方法用于判断笔记是否值得保存
+    private boolean isWorthSaving() {
         if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
                 || (existInDatabase() && !mNote.isLocalModified())) {
             return false;
@@ -259,11 +225,11 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
         }
     }
 
-    public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {//这个方法用于设置设置状态变更监听器。
+    public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
         mNoteSettingStatusListener = l;
     }
 
-    public void setAlertDate(long date, boolean set) {//这个方法用于设置提醒日期，并在设置状态监听器不为空的情况下调用提醒日期变更的回调方法
+    public void setAlertDate(long date, boolean set) {
         if (date != mAlertDate) {
             mAlertDate = date;
             mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate));
@@ -273,7 +239,7 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
         }
     }
 
-    public void markDeleted(boolean mark) {//这个方法用于标记笔记是否被删除，并在存在与该笔记相关的小部件并且设置状态监听器不为空的情况下调用小部件变更的回调方法
+    public void markDeleted(boolean mark) {
         mIsDeleted = mark;
         if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
                 && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
@@ -281,8 +247,7 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
         }
     }
 
-    public void setBgColorId(int id) {//这个方法用于设置背景颜色的ID，并在设置状态监听器不为空的情况下调用背景颜色变更的回调方法。
+    public void setBgColorId(int id) {
-
         if (id != mBgColorId) {
             mBgColorId = id;
             if (mNoteSettingStatusListener != null) {
@@ -292,8 +257,7 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
         }
     }
 
-    public void setCheckListMode(int mode) {//这个方法用于设置清单模式，并在设置状态监听器不为空的情况下调用清单模式变更的回调方法。
+    public void setCheckListMode(int mode) {
-
         if (mMode != mode) {
             if (mNoteSettingStatusListener != null) {
                 mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
@@ -303,85 +267,81 @@ public class WorkingNote {//`WorkingNote` 类用于管理笔记数据，包含
         }
     }
 
-    public void setWidgetType(int type) {//这个方法用于设置小部件类型
+    public void setWidgetType(int type) {
         if (type != mWidgetType) {
             mWidgetType = type;
             mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
         }
     }
 
-    public void setWidgetId(int id) {//这个方法用于设置小部件ID
+    public void setWidgetId(int id) {
         if (id != mWidgetId) {
             mWidgetId = id;
             mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
         }
     }
 
-    public void setWorkingText(String text) {//这个方法用于设置工作文本
+    public void setWorkingText(String text) {
         if (!TextUtils.equals(mContent, text)) {
             mContent = text;
             mNote.setTextData(DataColumns.CONTENT, mContent);
         }
     }
 
-    public void convertToCallNote(String phoneNumber, long callDate) {//这个方法用于将笔记转换为通话记录
+    public void convertToCallNote(String phoneNumber, long callDate) {
         mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
         mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
         mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
     }
 
-    public boolean hasClockAlert() {//这个方法用于判断笔记是否有闹钟提醒
+    public boolean hasClockAlert() {
         return (mAlertDate > 0 ? true : false);
     }
 
-    public String getContent() {//这个方法用于获取笔记内容
+    public String getContent() {
         return mContent;
     }
 
-    public long getAlertDate() {//这个方法用于获取提醒日期
+    public long getAlertDate() {
         return mAlertDate;
     }
 
-    public long getModifiedDate() {//这个方法用于获取笔记修改日期
+    public long getModifiedDate() {
         return mModifiedDate;
     }
 
-    public int getBgColorResId() {//这个方法用于获取背景颜色的资源ID
+    public int getBgColorResId() {
         return NoteBgResources.getNoteBgResource(mBgColorId);
     }
 
-    public int getBgColorId() {//这个方法用于获取背景颜色的ID
+    public int getBgColorId() {
         return mBgColorId;
     }
 
-    public int getTitleBgResId() {//这个方法用于获取标题背景的资源ID
+    public int getTitleBgResId() {
         return NoteBgResources.getNoteTitleBgResource(mBgColorId);
     }
 
-    public int getCheckListMode() {//这个方法用于获取清单模式
+    public int getCheckListMode() {
         return mMode;
     }
 
-    public long getNoteId() {//这个方法用于获取笔记ID
+    public long getNoteId() {
         return mNoteId;
     }
 
-    public long getFolderId() {//这个方法用于获取笔记所属文件夹的ID
+    public long getFolderId() {
         return mFolderId;
     }
 
-    public int getWidgetId() {//这个方法用于获取小部件的ID
+    public int getWidgetId() {
         return mWidgetId;
     }
 
-    public int getWidgetType() {//这个方法用于获取小部件的类型
+    public int getWidgetType() {
         return mWidgetType;
     }
 
-    /**
-     * 下面这是一个接口，定义了一系列方法，用于监听笔记设置的变化。
-     * 具体而言，包括背景颜色变化、闹钟提醒设置变化、通过小部件创建笔记以及切换清单模式和普通模式时的状态变化。
-     */
     public interface NoteSettingChangedListener {
         /**
          * Called when the background color of current note has just changed

src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java

@@ -73,41 +73,31 @@ public class DataUtils {
     }
 
     public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) {
-        // 创建一个ContentValues对象，用于存储需要更新的数据
+        ContentValues values = new ContentValues();
-        ContentValues values = new ContentValues();// 将笔记的父文件夹ID设置为目标文件夹ID
+        values.put(NoteColumns.PARENT_ID, desFolderId);
-        values.put(NoteColumns.PARENT_ID, desFolderId);// 将笔记的原始父文件夹ID设置为源文件夹ID
+        values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId);
-        values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId);// 将笔记的本地修改标志设置为1，表示需要同步到服务器
+        values.put(NoteColumns.LOCAL_MODIFIED, 1);
-        values.put(NoteColumns.LOCAL_MODIFIED, 1);// 使用ContentResolver对象更新笔记的数据
         resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null);
     }
 
     public static boolean batchMoveToFolder(ContentResolver resolver, HashSet<Long> ids,
             long folderId) {
-        // 该方法用于批量将多个笔记移动到指定文件夹中
-        // 检查传入的笔记ID集合是否为空
         if (ids == null) {
             Log.d(TAG, "the ids is null");
             return true;
         }
-        // 创建一个操作列表，用于存储需要执行的更新操作
+
         ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
-        // 遍历传入的笔记ID集合
         for (long id : ids) {
-            // 创建一个新的更新操作
             ContentProviderOperation.Builder builder = ContentProviderOperation
                     .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
-            // 设置更新操作的值，将笔记的父文件夹ID设置为目标文件夹ID
             builder.withValue(NoteColumns.PARENT_ID, folderId);
-            // 将笔记的本地修改标志设置为1，表示需要同步到服务器
             builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);
-            // 将更新操作添加到操作列表中
             operationList.add(builder.build());
         }
 
         try {
-            // 使用ContentResolver对象批量执行更新操作
             ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
-            // 检查更新操作是否成功
             if (results == null || results.length == 0 || results[0] == null) {
                 Log.d(TAG, "delete notes failed, ids:" + ids.toString());
                 return false;

src/Notes-master1/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);
@@ -507,23 +507,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        /**
-         * 当选中菜单项时的处理方法
-         * 根据菜单项的ID执行相应的操作
-         * 如果是新建笔记菜单项，则调用createNewNote()方法
-         * 如果是删除菜单项，则弹出确认对话框，确认后调用deleteCurrentNote()方法并结束当前活动
-         * 如果是字体大小菜单项，则显示字体大小选择器
-         * 如果是列表模式菜单项，则切换笔记的列表模式
-         * 如果是分享菜单项，则获取当前笔记内容并分享
-         * 如果是发送到桌面菜单项，则发送到桌面
-         * 如果是提醒菜单项，则设置提醒
-         * 如果是删除提醒菜单项，则清除提醒
-         */
         int itemId = item.getItemId();
         if (itemId == R.id.menu_new_note) {
-            createNewNote(); //调用创建新的便签的函数
+            createNewNote();
         } else if (itemId == R.id.menu_delete) {
-            //弹出确认对话框
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setTitle(getString(R.string.alert_title_delete));
             builder.setIcon(android.R.drawable.ic_dialog_alert);
@@ -531,32 +518,31 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             builder.setPositiveButton(android.R.string.ok,
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
-                            deleteCurrentNote();//确认后调用删除笔记的函数
+                            deleteCurrentNote();
-                            finish();//结束当前活动
+                            finish();
                         }
                     });
             builder.setNegativeButton(android.R.string.cancel, null);
             builder.show();
         } else if (itemId == R.id.menu_font_size) {
-            mFontSizeSelector.setVisibility(View.VISIBLE);//显示字体大小选择器
+            mFontSizeSelector.setVisibility(View.VISIBLE);
-            findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);//根据当前字体大小设置选择器状态
+            findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
         } else if (itemId == R.id.menu_list_mode) {
             mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
-                    TextNote.MODE_CHECK_LIST : 0);//切换笔记的列表模式
+                    TextNote.MODE_CHECK_LIST : 0);
         } else if (itemId == R.id.menu_share) {
-            getWorkingText();//获取当前笔记内容
+            getWorkingText();
-            sendTo(this, mWorkingNote.getContent());//分享笔记内容
+            sendTo(this, mWorkingNote.getContent());
         } else if (itemId == R.id.menu_send_to_desktop) {
-            sendToDesktop();//发送到桌面
+            sendToDesktop();
         } else if (itemId == R.id.menu_alert) {
-            setReminder();//设置提醒
+            setReminder();
         } else if (itemId == R.id.menu_delete_remind) {
-            mWorkingNote.setAlertDate(0, false);//清除提醒
+            mWorkingNote.setAlertDate(0, false);
         }
         return true;
     }
 
-
     private void setReminder() {
         DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
         d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
@@ -579,13 +565,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     private void createNewNote() {
-        /**
-         * 创建新的笔记
-         * 首先，保存当前正在编辑的笔记
-         * 为了安全起见，启动一个新的NoteEditActivity
-         * 然后结束当前活动
-         * 创建一个新的Intent，并传递相关参数
-         */
         // Firstly, save current editing notes
         saveNote();