增添了更换首页面背景的功能

3 years ago · 1ff9c4dbb4
parent c9b5cc7bed
commit 1ff9c4dbb4
327 changed files with 15035 additions and 2060 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -2,11 +2,7 @@
 <project version="4">
  <component name="ProjectModuleManager">
    <modules>
-<<<<<<< HEAD
-      <module fileurl="file://$PROJECT_DIR$/xiaomi_Note.iml" filepath="$PROJECT_DIR$/xiaomi_Note.iml" />
-=======
      <module fileurl="file://$PROJECT_DIR$/.idea/xiaomi_Note.iml" filepath="$PROJECT_DIR$/.idea/xiaomi_Note.iml" />
->>>>>>> e29be7529771528cdc0b8c2e431e41e58f52ca18
    </modules>
  </component>
 </project>
--- a/.idea/xiaomi_Note.iml
+++ b/.idea/xiaomi_Note.iml
@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration />
+    </facet>
+  </component>
  <component name="NewModuleRootManager" inherit-compiler-output="true">
    <exclude-output />
    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/src/Notes-master/.gradle/7.3.3/checksums/checksums.lock
+++ b/src/Notes-master/.gradle/7.3.3/checksums/checksums.lock
--- a/src/Notes-master/.gradle/7.3.3/checksums/md5-checksums.bin
+++ b/src/Notes-master/.gradle/7.3.3/checksums/md5-checksums.bin
--- a/src/Notes-master/.gradle/7.3.3/checksums/sha1-checksums.bin
+++ b/src/Notes-master/.gradle/7.3.3/checksums/sha1-checksums.bin
--- a/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin
+++ b/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin
--- a/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock
+++ b/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock
--- a/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin
+++ b/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin
--- a/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin
+++ b/src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin
--- a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
--- a/src/Notes-master/.gradle/file-system.probe
+++ b/src/Notes-master/.gradle/file-system.probe
--- a/src/Notes-master/app/build.gradle
+++ b/src/Notes-master/app/build.gradle
@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 33
+    /*compileSdkVersion 28
    buildToolsVersion "30.0.0"
    useLibrary 'org.apache.http.legacy'
    defaultConfig {
@ -9,7 +9,18 @@ android {
        useLibrary'org.apache.http.legacy'

        targetSdkVersion 30
-        minSdkVersion 11
+        //minSdkVersion 16
+        minSdkVersion 14
+    }*/
+    compileSdkVersion 30
+    buildToolsVersion "30.0.0"
+    useLibrary 'org.apache.http.legacy'
+    defaultConfig {
+        applicationId "net.micode.notes"
+        useLibrary'org.apache.http.legacy'
+
+        targetSdkVersion 27
+        minSdkVersion 21
    }

    buildTypes {
@ -18,6 +29,20 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
        }
    }
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+task wrapper(type: Wrapper){
+    gradleVersion = '8.0'
+}
+task prepareKotlinBuildScriptModel{
+
+}
+
+dependencies {
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 }
 /*
 sonarqube {
--- a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
+++ b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
--- a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
+++ b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_0/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_0/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_1/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_1/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_2/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_2/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_3/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_3/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_4/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_4/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_5/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_5/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_6/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_6/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_7/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_7/graph.bin
--- a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
+++ b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
--- a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
+++ b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
--- a/src/Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out
+++ b/src/Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out
@ -1 +1 @@
-8
+4
--- a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
+++ b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@ -1,100 +1,105 @@
-#Sat Oct 22 08:48:55 CST 2022
-net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-7\:/layout/activity_login.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-7\:/raw/introduction=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-7\:/layout/activity_set_loginpassword.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_set_loginpassword.xml.flat
-net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-7\:/layout/activity_change_password.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_change_password.xml.flat
-net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-7\:/layout/activity_delete_password.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_delete_password.xml.flat
+#Fri Oct 28 08:56:44 CST 2022
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_list.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_green_down.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_list_footer.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/settings_header.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/widget_2x.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_edit_list_item.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/selected.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_red.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_white_middle.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-10\:/xml/preferences.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_red_up.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/font_normal.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_blue.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_white.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_red.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/title_alert.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/font_super.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_background.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-10\:/menu/note_list.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_white.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/clock.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/account_dialog_title.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_edit.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_green_single.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/yourname.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_yourname.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/notification.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/sanye.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_sanye.png.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/activity_change_password.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_change_password.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/widget_4x.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_middle.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_red_middle.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_red_single.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_single.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/new_note_normal.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_white_up.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_list_dropdown_menu.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_yellow.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_green_up.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_footer_bg.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/dropdown_icon.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/folder_list_item.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/new_note_pressed.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_green_middle.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_red.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-10\:/menu/note_list_options.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_item.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/menu_move.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/activity_delete_password.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_delete_password.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_white.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-10\:/menu/call_note_edit.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/narutuo.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_narutuo.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/call_record.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-10\:/color/secondary_text_dark.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_up.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/add_account_text.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_white_single.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/title_bar_bg.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_blue.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/impess.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_impess.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_green.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_down.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-10\:/xml/widget_4x_info.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/font_small.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_folder.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-10\:/menu/sub_folder.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-10\:/drawable/new_note.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_up.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_green.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-10\:/color/primary_text_dark.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/activity_set_loginpassword.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_set_loginpassword.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_single.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/activity_login.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/icon_app.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_blue.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-10\:/menu/note_list_dropdown.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-10\:/raw-zh-rCN/introduction=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_red_down.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_white_down.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-10\:/raw/introduction=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/icon_app_new.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app_new.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/delete.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_red.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_green.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-10\:/menu/call_record_folder.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-10\:/xml/widget_2x_info.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_blue.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/font_large.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/datetime_picker.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/bg_btn_set_color.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/dialog_edit_text.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_down.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_white.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_green.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/search_result.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_yellow.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_yellow.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-10\:/xml/searchable.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/menu_delete.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-10\:/menu/note_edit.xml=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@ -7,18 +7,48 @@
    <plurals name="search_results_title">
        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
    </plurals>
+    <string name="LoginSetting">设置账户密码</string>
+    <string msgid="4600421777120114993" name="abc_action_bar_home_description">"转到主屏幕"</string>
+    <string msgid="1594238315039666878" name="abc_action_bar_up_description">"转到上一层级"</string>
+    <string msgid="3588849162933574182" name="abc_action_menu_overflow_description">"更多选项"</string>
+    <string msgid="4076576682505996667" name="abc_action_mode_done">"完成"</string>
+    <string msgid="7468859129482906941" name="abc_activity_chooser_view_see_all">"查看全部"</string>
+    <string msgid="2031811694353399454" name="abc_activitychooserview_choose_application">"选择应用"</string>
+    <string msgid="121134116657445385" name="abc_capital_off">"关闭"</string>
+    <string msgid="3405795526292276155" name="abc_capital_on">"开启"</string>
+    <string msgid="1302280443949172191" name="abc_menu_alt_shortcut_label">"Alt+"</string>
+    <string msgid="1324831542140195728" name="abc_menu_ctrl_shortcut_label">"Ctrl+"</string>
+    <string msgid="8362206064229013510" name="abc_menu_delete_shortcut_label">"Delete 键"</string>
+    <string msgid="8341180395196749340" name="abc_menu_enter_shortcut_label">"Enter 键"</string>
+    <string msgid="4792426091847145555" name="abc_menu_function_shortcut_label">"Fn+"</string>
+    <string msgid="7643535737296831317" name="abc_menu_meta_shortcut_label">"Meta+"</string>
+    <string msgid="8126296154200614004" name="abc_menu_shift_shortcut_label">"Shift+"</string>
+    <string msgid="2378550843553983978" name="abc_menu_space_shortcut_label">"空格键"</string>
+    <string msgid="9002602288060866689" name="abc_menu_sym_shortcut_label">"Sym+"</string>
+    <string msgid="1351762916121158029" name="abc_prepend_shortcut_label">"Menu+"</string>
+    <string msgid="7723749260725869598" name="abc_search_hint">"搜索…"</string>
+    <string msgid="3691816814315814921" name="abc_searchview_description_clear">"清除查询"</string>
+    <string msgid="2550479030709304392" name="abc_searchview_description_query">"搜索查询"</string>
+    <string msgid="8264924765203268293" name="abc_searchview_description_search">"搜索"</string>
+    <string msgid="8928215447528550784" name="abc_searchview_description_submit">"提交查询"</string>
+    <string msgid="893419373245838918" name="abc_searchview_description_voice">"语音搜索"</string>
+    <string msgid="3421042268587513524" name="abc_shareactionprovider_share_with">"分享方式"</string>
+    <string msgid="3300176832234831527" name="abc_shareactionprovider_share_with_application">"使用<ns1:g id="APPLICATION_NAME">%s</ns1:g>分享"</string>
+    <string msgid="1603543279005712093" name="abc_toolbar_collapse_description">"收起"</string>
    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
    <string name="alert_title_delete">删除</string>
-    <string name="app_name">便签</string>
+    <string name="app_name">你的日记</string>
    <string name="app_widget2x2">便签2x2</string>
    <string name="app_widget4x4">便签4x4</string>
    <string name="button_delete">删除</string>
    <string name="call_record_folder_name">通话便签</string>
    <string name="datetime_dialog_cancel">取消</string>
    <string name="datetime_dialog_ok">设置</string>
+    <string name="delete_password">删除账户密码</string>
    <string name="delete_remind_time_message">成功删除提醒</string>
+    <string name="dummy_content">生活要五颜六色 不要乱七八糟</string>
    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
    <string name="error_note_not_exist">要查看的便签不存在</string>
@ -36,7 +66,7 @@
    <string name="hint_foler_name">请输入名称</string>
    <string name="info_note_enter_desktop">已添加到桌面</string>
    <string name="menu_alert">提醒我</string>
-    <string name="menu_countallNotes">便签数量 </string>
+    <string name="menu_countallNotes">当前便签数量 </string>
    <string name="menu_create_folder">新建文件夹</string>
    <string name="menu_delete">删除</string>
    <string name="menu_deselect_all">取消全选</string>
@ -53,6 +83,7 @@
    <string name="menu_list_mode">进入清单模式</string>
    <string name="menu_move">移动到文件夹</string>
    <string name="menu_move_parent_folder">上一级文件夹</string>
+    <string name="menu_narutuo">背景：鼬</string>
    <string name="menu_normal_mode">退出清单模式</string>
    <string name="menu_remove_remind">删除提醒</string>
    <string name="menu_search">搜索</string>
@ -65,6 +96,8 @@
    <string name="menu_sync">同步</string>
    <string name="menu_sync_cancel">取消同步</string>
    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="menu_yourname1.0">背景：泷</string>
+    <string name="menu_yourname2.0">背景：叶</string>
    <string name="note_alert_expired">已过期</string>
    <string name="note_link_email">发送邮件</string>
    <string name="note_link_other">打开地图</string>
@ -94,8 +127,10 @@
    <string name="search">便签</string>
    <string name="search_hint">搜索便签</string>
    <string name="search_label">正在搜索便签</string>
+    <string msgid="146198913615257606" name="search_menu_title">"搜索"</string>
    <string name="search_setting_description">便签中的文字</string>
    <string name="set_remind_time_message">创建提醒</string>
+    <string msgid="7988687684186075107" name="status_bar_notification_info_overflow">"999+"</string>
    <string name="success_sdcard_export">导出成功</string>
    <string name="success_sync_account">与%1$s同步成功</string>
    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes-master/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:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\assets"/><source path="D:\xiaomi\xiaomi_Note\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\assets"/><source path="D:\softproject\xiaomi_Note\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\softproject\xiaomi_Note\src\Notes-master\app\src\debug\assets"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/Notes-master/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:\xiaomi\xiaomi_Note\src\Notes-master\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:\xiaomi\xiaomi_Note\src\Notes-master\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:\softproject\xiaomi_Note\src\Notes-master\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:\softproject\xiaomi_Note\src\Notes-master\app\src\debug\jniLibs"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/Notes-master/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:\xiaomi\xiaomi_Note\src\Notes-master\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:\xiaomi\xiaomi_Note\src\Notes-master\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:\softproject\xiaomi_Note\src\Notes-master\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:\softproject\xiaomi_Note\src\Notes-master\app\src\debug\shaders"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@ -1,4 +1,25 @@
-#Sat Oct 22 08:49:05 CST 2022
-base.0=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
-renamed.0=classes.dex
+#Fri Oct 28 09:09:31 CST 2022
+path.4=13/classes.dex
+path.3=12/classes.dex
+path.2=11/classes.dex
+path.1=0/classes.dex
+path.7=5/classes.dex
+path.6=4/classes.dex
+path.5=15/classes.dex
 path.0=classes.dex
+base.4=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex
+base.3=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex
+base.2=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
+base.1=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
+base.0=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
+renamed.3=classes4.dex
+renamed.2=classes3.dex
+renamed.1=classes2.dex
+renamed.0=classes.dex
+renamed.7=classes8.dex
+renamed.6=classes7.dex
+base.7=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex
+renamed.5=classes6.dex
+base.6=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
+renamed.4=classes5.dex
+base.5=D\:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
--- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@ -1,359 +1,330 @@
 1<?xml version="1.0" encoding="utf-8"?>
-2<!--
-3 Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-4
-5     Licensed under the Apache License, Version 2.0 (the "License");
-6     you may not use this file except in compliance with the License.
-7     You may obtain a copy of the License at
-8
-9          http://www.apache.org/licenses/LICENSE-2.0
+2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+3    package="net.micode.notes"
+4    android:versionCode="1"
+5    android:versionName="0.1" >
+6
+7    <uses-sdk
+8        android:minSdkVersion="21"
+8-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml
+9        android:targetSdkVersion="27" />
+9-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml
 10
-11     Unless required by applicable law or agreed to in writing, software
-12     distributed under the License is distributed on an "AS IS" BASIS,
-13     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-14     See the License for the specific language governing permissions and
-15     limitations under the License.
-16-->
-17<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-18    package="net.micode.notes"
-19    android:versionCode="1"
-20    android:versionName="0.1" >
-21
-22    <uses-sdk
-23        android:minSdkVersion="11"
-23-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml
-24        android:targetSdkVersion="30" />
-24-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml
-25
-26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-26-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:5-81
-26-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:22-78
-27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-88
-27-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-85
-28    <uses-permission android:name="android.permission.INTERNET" />
-28-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-67
-28-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-64
-29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-72
-29-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-69
-30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-74
-30-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-71
-31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-80
-31-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-77
-32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-71
-32-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-68
-33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-74
-33-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-71
-34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-81
-34-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-78
-35
-36    <application
-36-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:34:5-210:19
-37        android:debuggable="true"
-38        android:icon="@drawable/icon_app"
-38-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:35:9-42
-39        android:label="@string/app_name"
-39-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-41
-40        android:testOnly="true" >
-41        <activity
-41-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
-42            android:name="net.micode.notes.ui.LoginActivity"
-42-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-45
-43            android:configChanges="keyboardHidden|orientation|screenSize"
-43-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
-44            android:label="@string/app_name"
-44-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
-45            android:launchMode="singleTop"
-45-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
-46            android:theme="@style/NoteTheme"
-46-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
-47            android:windowSoftInputMode="adjustPan" >
-47-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
-48
-49            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
-50            <intent-filter>
-50-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
-51                <action android:name="android.intent.action.MAIN" />
-51-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
-51-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
-52
-53                <category android:name="android.intent.category.LAUNCHER" />
-53-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
-53-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
-54            </intent-filter>
-55        </activity>
+11    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+11-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:7:5-81
+11-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:7:22-78
+12    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+12-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:8:5-88
+12-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:8:22-85
+13    <uses-permission android:name="android.permission.INTERNET" />
+13-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:9:5-67
+13-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:9:22-64
+14    <uses-permission android:name="android.permission.READ_CONTACTS" />
+14-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:10:5-72
+14-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:10:22-69
+15    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+15-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:11:5-74
+15-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:11:22-71
+16    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+16-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:12:5-80
+16-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:12:22-77
+17    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+17-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:13:5-71
+17-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:13:22-68
+18    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+18-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:14:5-74
+18-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:14:22-71
+19    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+19-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:15:5-81
+19-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:15:22-78
+20
+21    <application
+21-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:17:5-172:19
+22        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
+22-->[com.android.support:support-compat:28.0.0] C:\Users\86136\.gradle\caches\transforms-3\84be8dd4a897be82a953f70eaa03f66c\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91
+23        android:debuggable="true"
+24        android:icon="@drawable/icon_app_new"
+24-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:18:9-46
+25        android:label="@string/app_name"
+25-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:19:9-41
+26        android:testOnly="true" >
+27        <activity
+27-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:21:9-35:20
+28            android:name="net.micode.notes.ui.LoginActivity"
+28-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:22:13-45
+29            android:configChanges="keyboardHidden|orientation|screenSize"
+29-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:23:13-74
+30            android:label="@string/app_name"
+30-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:13-45
+31            android:launchMode="singleTop"
+31-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:13-43
+32            android:theme="@style/NoteTheme"
+32-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:13-45
+33            android:windowSoftInputMode="adjustPan" >
+33-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:13-52
+34
+35            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
+36            <intent-filter>
+36-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:13-34:29
+37                <action android:name="android.intent.action.MAIN" />
+37-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:17-69
+37-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:25-66
+38
+39                <category android:name="android.intent.category.LAUNCHER" />
+39-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:33:17-77
+39-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:33:27-74
+40            </intent-filter>
+41        </activity>
+42        <activity
+42-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42:64
+43            android:name="net.micode.notes.ui.ChangingPassword"
+43-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:37:13-48
+44            android:configChanges="keyboardHidden|orientation|screenSize"
+44-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:38:13-74
+45            android:label="@string/app_name"
+45-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-45
+46            android:launchMode="singleTop"
+46-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-43
+47            android:theme="@style/NoteTheme"
+47-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
+48            android:windowSoftInputMode="adjustPan" />
+48-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-52
+49        <activity
+49-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:43:9-49:64
+50            android:name="net.micode.notes.ui.SettingPassword"
+50-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-47
+51            android:configChanges="keyboardHidden|orientation|screenSize"
+51-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:45:13-74
+52            android:label="@string/app_name"
+52-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-45
+53            android:launchMode="singleTop"
+53-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:13-43
+54            android:theme="@style/NoteTheme"
+54-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:13-45
+55            android:windowSoftInputMode="adjustPan" />
+55-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:49:13-52
 56        <activity
-56-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-59:20
-57            android:name="net.micode.notes.ui.ChangingPassword"
-57-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48
+56-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:50:9-56:64
+57            android:name="net.micode.notes.ui.DeletingPassword"
+57-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:51:13-48
 58            android:configChanges="keyboardHidden|orientation|screenSize"
-58-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
+58-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:52:13-74
 59            android:label="@string/app_name"
-59-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-45
+59-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-45
 60            android:launchMode="singleTop"
-60-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
+60-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-43
 61            android:theme="@style/NoteTheme"
-61-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
-62            android:windowSoftInputMode="adjustPan" >
-62-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-52
-63        </activity>
-64        <activity
-64-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:61:9-68:20
-65            android:name="net.micode.notes.ui.SettingPassword"
-65-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:62:13-47
-66            android:configChanges="keyboardHidden|orientation|screenSize"
-66-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:63:13-74
-67            android:label="@string/app_name"
-67-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:64:13-45
-68            android:launchMode="singleTop"
-68-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-43
-69            android:theme="@style/NoteTheme"
-69-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-45
-70            android:windowSoftInputMode="adjustPan" >
-70-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:67:13-52
-71        </activity>
-72        <activity
-72-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:70:9-77:20
-73            android:name="net.micode.notes.ui.DeletingPassword"
-73-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:71:13-48
-74            android:configChanges="keyboardHidden|orientation|screenSize"
-74-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-74
-75            android:label="@string/app_name"
-75-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-45
-76            android:launchMode="singleTop"
-76-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:74:13-43
-77            android:theme="@style/NoteTheme"
-77-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:75:13-45
-78            android:windowSoftInputMode="adjustPan" >
-78-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:76:13-52
-79        </activity>
-80
-81        <!-- <activity -->
-82        <!-- android:name=".ui.SearchActivity" -->
-83        <!-- android:configChanges="keyboardHidden|orientation|screenSize" -->
-84        <!-- android:label="@string/app_name" -->
-85        <!-- android:launchMode="singleTop" -->
-86        <!-- android:theme="@style/NoteTheme" -->
-87        <!-- android:windowSoftInputMode="adjustPan" > -->
-88        <!-- </activity> -->
-89
-90        <activity
-90-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:90:9-102:20
-91            android:name="net.micode.notes.ui.NotesListActivity"
-91-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-49
-92            android:configChanges="keyboardHidden|orientation|screenSize"
-92-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:92:13-74
-93            android:label="@string/app_name"
-93-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:93:13-45
-94            android:launchMode="singleTop"
-94-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:94:13-43
-95            android:theme="@style/NoteTheme"
-95-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:95:13-45
-96            android:windowSoftInputMode="adjustPan" >
-96-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-52
-97
-98            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
-99            <!-- <intent-filter> -->
-100            <!-- <action android:name="android.intent.action.MAIN" /> -->
-101            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
-102            <!-- </intent-filter> -->
-103        </activity>
-104        <activity
-104-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:104:9-136:20
-105            android:name="net.micode.notes.ui.NoteEditActivity"
-105-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:105:13-48
-106            android:configChanges="keyboardHidden|orientation|screenSize"
-106-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:106:13-74
-107            android:launchMode="singleTop"
-107-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:107:13-43
-108            android:theme="@style/NoteTheme" >
-108-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:108:13-45
-109            <intent-filter>
-109-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:110:13-115:29
-110                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-110-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:17-79
-110-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:25-76
-111
-112                <category android:name="android.intent.category.DEFAULT" />
-112-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76
-112-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73
-113
-114                <data android:mimeType="vnd.android.cursor.item/text_note" />
-114-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
-114-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
-115                <data android:mimeType="vnd.android.cursor.item/call_note" />
-115-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
-115-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
-116            </intent-filter>
-117            <intent-filter>
-117-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-120:29
-118                <action android:name="android.intent.action.SEARCH" />
-118-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-71
-118-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-68
-119
-120                <category android:name="android.intent.category.DEFAULT" />
-120-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76
-120-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73
-121            </intent-filter>
-122            <intent-filter>
-122-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-127:29
-123                <action android:name="android.intent.action.VIEW" />
-123-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:17-69
-123-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:25-66
+61-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-45
+62            android:windowSoftInputMode="adjustPan" /> <!-- <activity -->
+62-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-52
+63        <!-- android:name=".ui.SearchActivity" -->
+64        <!-- android:configChanges="keyboardHidden|orientation|screenSize" -->
+65        <!-- android:label="@string/app_name" -->
+66        <!-- android:launchMode="singleTop" -->
+67        <!-- android:theme="@style/NoteTheme" -->
+68        <!-- android:windowSoftInputMode="adjustPan" > -->
+69        <!-- </activity> -->
+70        <activity
+70-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:64:9-77:20
+71            android:name="net.micode.notes.ui.NotesListActivity"
+71-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-49
+72            android:configChanges="keyboardHidden|orientation|screenSize"
+72-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-74
+73            android:label="@string/app_name"
+73-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:67:13-45
+74            android:launchMode="singleTop"
+74-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:68:13-43
+75            android:theme="@style/NoteTheme"
+75-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:69:13-45
+76            android:windowSoftInputMode="adjustPan" >
+76-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:70:13-52
+77
+78            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
+79            <!-- <intent-filter> -->
+80            <!-- <action android:name="android.intent.action.MAIN" /> -->
+81            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+82            <!-- </intent-filter> -->
+83        </activity>
+84        <activity
+84-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:78:9-111:20
+85            android:name="net.micode.notes.ui.NoteEditActivity"
+85-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:79:13-48
+86            android:configChanges="keyboardHidden|orientation|screenSize"
+86-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:80:13-74
+87            android:launchMode="singleTop"
+87-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:81:13-43
+88            android:theme="@style/NoteTheme" >
+88-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:82:13-45
+89            <intent-filter>
+89-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-90:29
+90                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+90-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:84:17-79
+90-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:84:25-76
+91
+92                <category android:name="android.intent.category.DEFAULT" />
+92-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:86:17-76
+92-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:86:27-73
+93
+94                <data android:mimeType="vnd.android.cursor.item/text_note" />
+94-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:88:17-78
+94-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:88:23-75
+95                <data android:mimeType="vnd.android.cursor.item/call_note" />
+95-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:88:17-78
+95-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:88:23-75
+96            </intent-filter>
+97            <intent-filter>
+97-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
+98                <action android:name="android.intent.action.SEARCH" />
+98-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-71
+98-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-68
+99
+100                <category android:name="android.intent.category.DEFAULT" />
+100-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:86:17-76
+100-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:86:27-73
+101            </intent-filter>
+102            <intent-filter>
+102-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-103:29
+103                <action android:name="android.intent.action.VIEW" />
+103-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-69
+103-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:97:25-66
+104
+105                <category android:name="android.intent.category.DEFAULT" />
+105-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:86:17-76
+105-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:86:27-73
+106
+107                <data android:mimeType="vnd.android.cursor.item/text_note" />
+107-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:88:17-78
+107-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:88:23-75
+108                <data android:mimeType="vnd.android.cursor.item/call_note" />
+108-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:88:17-78
+108-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:88:23-75
+109            </intent-filter>
+110
+111            <meta-data
+111-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:105:13-107:54
+112                android:name="android.app.searchable"
+112-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:106:17-54
+113                android:resource="@xml/searchable" />
+113-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:107:17-51
+114            <!-- <meta-data>必须包括android:name这个属性，而且其值必须为"android.app.searchable"， -->
+115            <!-- 还必须包括android:resource这个属性，它指定了我们的search dialog的配置文件。 -->
+116
+117        </activity>
+118
+119        <provider
+119-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:9-117:52
+120            android:name="net.micode.notes.data.NotesProvider"
+120-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:114:13-63
+121            android:authorities="micode_notes"
+121-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:115:13-47
+122            android:exported="false"
+122-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-37
+123            android:multiprocess="true" />
+123-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-40
 124
-125                <category android:name="android.intent.category.DEFAULT" />
-125-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76
-125-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73
-126
-127                <data android:mimeType="vnd.android.cursor.item/text_note" />
-127-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
-127-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
-128                <data android:mimeType="vnd.android.cursor.item/call_note" />
-128-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
-128-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
-129            </intent-filter>
-130
-131            <meta-data
-131-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-132:54
-132                android:name="android.app.searchable"
-132-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:131:17-54
-133                android:resource="@xml/searchable" />
-133-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:132:17-51
-134            <!-- <meta-data>必须包括android:name这个属性，而且其值必须为"android.app.searchable"， -->
-135            <!-- 还必须包括android:resource这个属性，它指定了我们的search dialog的配置文件。 -->
-136
-137        </activity>
-138
-139        <provider
-139-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:138:9-143:20
-140            android:name="net.micode.notes.data.NotesProvider"
-140-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:139:13-63
-141            android:authorities="micode_notes"
-141-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:140:13-47
-142            android:exported="false"
-142-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-37
-143            android:multiprocess="true" >
-143-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-40
-144        </provider>
-145
-146        <receiver
-146-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-157:20
-147            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-147-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-57
-148            android:label="@string/app_widget2x2" >
-148-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-50
-149            <intent-filter>
-149-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29
-150                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-150-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84
-150-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81
-151                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-151-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85
-151-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82
-152                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-152-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85
-152-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82
-153            </intent-filter>
-154
-155            <meta-data
-155-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58
-156                android:name="android.appwidget.provider"
-156-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58
-157                android:resource="@xml/widget_2x_info" />
-157-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55
-158        </receiver>
-159        <receiver
-159-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:159:9-172:20
-160            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-160-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:160:13-57
-161            android:label="@string/app_widget4x4" >
-161-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:161:13-50
-162            <intent-filter>
-162-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29
-163                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-163-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84
-163-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81
-164                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-164-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85
-164-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82
-165                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-165-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85
-165-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82
-166            </intent-filter>
-167
-168            <meta-data
-168-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58
-169                android:name="android.appwidget.provider"
-169-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58
-170                android:resource="@xml/widget_4x_info" />
-170-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55
-171        </receiver>
-172        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-172-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:9-178:20
-172-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:19-55
-173            <intent-filter>
-173-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:175:13-177:29
-174                <action android:name="android.intent.action.BOOT_COMPLETED" />
-174-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:17-79
-174-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:25-76
-175            </intent-filter>
-176        </receiver>
-177        <receiver
-177-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:180:9-183:20
-178            android:name="net.micode.notes.ui.AlarmReceiver"
-178-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:181:13-61
-179            android:process=":remote" >
-179-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:182:13-38
-180        </receiver>
-181
-182        <activity
-182-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:185:9-190:20
-183            android:name="net.micode.notes.ui.AlarmAlertActivity"
-183-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:186:13-50
-184            android:label="@string/app_name"
-184-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:187:13-45
-185            android:launchMode="singleInstance"
-185-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:188:13-48
-186            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-186-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:189:13-75
-187        </activity>
-188        <activity
-188-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:192:9-197:20
-189            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-189-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:193:13-71
-190            android:label="@string/preferences_title"
-190-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:194:13-54
-191            android:launchMode="singleTop"
-191-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:195:13-43
-192            android:theme="@android:style/Theme.Holo.Light" >
-192-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:196:13-60
-193        </activity>
-194
-195        <service
-195-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:199:9-202:19
-196            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-196-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:200:13-74
-197            android:exported="false" >
-197-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:201:13-37
-198        </service>
-199
-200        <meta-data
-200-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:204:9-206:52
-201            android:name="android.app.default_searchable"
-201-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:205:13-58
-202            android:value=".ui.NoteEditActivity" />
-202-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:206:13-49
-203        <!--
-204                    如果你想为你的应用程序的每个activity 都提供该search dialog, 那么将<meta-data>元素加入<application>中，
-205                    通过这种方式, 每个activity 都继承了该值, 提供search dialog, 并把searches传送到同一个searchable activity.
-206                    <meta-data>元素，它声明了使用哪个searchable activity来执行搜索
-207        -->
-208    </application>
-209
-210</manifest>
+125        <receiver
+125-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:119:9-131:20
+126            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+126-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:120:13-57
+127            android:label="@string/app_widget2x2" >
+127-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:121:13-50
+128            <intent-filter>
+128-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-126:29
+129                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+129-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:17-84
+129-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:25-81
+130                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+130-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:124:17-85
+130-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:124:25-82
+131                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+131-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:125:17-85
+131-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:125:25-82
+132            </intent-filter>
+133
+134            <meta-data
+134-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-130:58
+135                android:name="android.appwidget.provider"
+135-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:129:17-58
+136                android:resource="@xml/widget_2x_info" />
+136-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:130:17-55
+137        </receiver>
+138        <receiver
+138-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:132:9-144:20
+139            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+139-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:133:13-57
+140            android:label="@string/app_widget4x4" >
+140-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-50
+141            <intent-filter>
+141-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-126:29
+142                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+142-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:17-84
+142-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:25-81
+143                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+143-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:124:17-85
+143-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:124:25-82
+144                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+144-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:125:17-85
+144-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:125:25-82
+145            </intent-filter>
+146
+147            <meta-data
+147-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-130:58
+148                android:name="android.appwidget.provider"
+148-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:129:17-58
+149                android:resource="@xml/widget_4x_info" />
+149-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:130:17-55
+150        </receiver>
+151        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+151-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-149:20
+151-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:145:19-55
+152            <intent-filter>
+152-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-148:29
+153                <action android:name="android.intent.action.BOOT_COMPLETED" />
+153-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:147:17-79
+153-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:147:25-76
+154            </intent-filter>
+155        </receiver>
+156        <receiver
+156-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:9-152:50
+157            android:name="net.micode.notes.AlarmReceiver"
+157-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:13-42
+158            android:process=":remote" />
+158-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:152:13-38
+159
+160        <activity
+160-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:9-158:87
+161            android:name="net.micode.notes.ui.AlarmAlertActivity"
+161-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:13-50
+162            android:label="@string/app_name"
+162-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:13-45
+163            android:launchMode="singleInstance"
+163-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:157:13-48
+164            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
+164-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:158:13-75
+165        <activity
+165-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:159:9-163:72
+166            android:name="net.micode.notes.NotesPreferenceActivity"
+166-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:160:13-52
+167            android:label="@string/preferences_title"
+167-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:161:13-54
+168            android:launchMode="singleTop"
+168-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:162:13-43
+169            android:theme="@android:style/Theme.Holo.Light" />
+169-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:163:13-60
+170
+171        <service
+171-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:165:9-167:48
+172            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+172-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:166:13-74
+173            android:exported="false" />
+173-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:167:13-37
+174
+175        <meta-data
+175-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:169:9-171:52
+176            android:name="android.app.default_searchable"
+176-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:170:13-58
+177            android:value=".ui.NoteEditActivity" />
+177-->D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:171:13-49
+178    </application>
+179
+180</manifest>
--- a/src/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar
+++ b/src/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar
--- a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="net.micode.notes"
    android:versionCode="1"
    android:versionName="0.1" >

    <uses-sdk
-        android:minSdkVersion="11"
-        android:targetSdkVersion="30" />
+        android:minSdkVersion="21"
+        android:targetSdkVersion="27" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@ -34,8 +19,9 @@
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <application
+        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
        android:debuggable="true"
-        android:icon="@drawable/icon_app"
+        android:icon="@drawable/icon_app_new"
        android:label="@string/app_name"
        android:testOnly="true" >
        <activity
@ -59,26 +45,21 @@
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
-        </activity>
+            android:windowSoftInputMode="adjustPan" />
        <activity
            android:name="net.micode.notes.ui.SettingPassword"
            android:configChanges="keyboardHidden|orientation|screenSize"
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
-        </activity>
+            android:windowSoftInputMode="adjustPan" />
        <activity
            android:name="net.micode.notes.ui.DeletingPassword"
            android:configChanges="keyboardHidden|orientation|screenSize"
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
-        </activity>
-
-        <!-- <activity -->
+            android:windowSoftInputMode="adjustPan" /> <!-- <activity -->
        <!-- android:name=".ui.SearchActivity" -->
        <!-- android:configChanges="keyboardHidden|orientation|screenSize" -->
        <!-- android:label="@string/app_name" -->
@ -86,7 +67,6 @@
        <!-- android:theme="@style/NoteTheme" -->
        <!-- android:windowSoftInputMode="adjustPan" > -->
        <!-- </activity> -->
-
        <activity
            android:name="net.micode.notes.ui.NotesListActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
@ -140,8 +120,7 @@
            android:name="net.micode.notes.data.NotesProvider"
            android:authorities="micode_notes"
            android:exported="false"
-            android:multiprocess="true" >
-        </provider>
+            android:multiprocess="true" />

        <receiver
            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
@ -175,36 +154,27 @@
            </intent-filter>
        </receiver>
        <receiver
-            android:name="net.micode.notes.ui.AlarmReceiver"
-            android:process=":remote" >
-        </receiver>
+            android:name="net.micode.notes.AlarmReceiver"
+            android:process=":remote" />

        <activity
            android:name="net.micode.notes.ui.AlarmAlertActivity"
            android:label="@string/app_name"
            android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-        </activity>
+            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
        <activity
-            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+            android:name="net.micode.notes.NotesPreferenceActivity"
            android:label="@string/preferences_title"
            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light" >
-        </activity>
+            android:theme="@android:style/Theme.Holo.Light" />

        <service
            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-            android:exported="false" >
-        </service>
+            android:exported="false" />

        <meta-data
            android:name="android.app.default_searchable"
            android:value=".ui.NoteEditActivity" />
-        <!--
-                    如果你想为你的应用程序的每个activity 都提供该search dialog, 那么将<meta-data>元素加入<application>中，
-                    通过这种方式, 每个activity 都继承了该值, 提供search dialog, 并把searches传送到同一个searchable activity.
-                    <meta-data>元素，它声明了使用哪个searchable activity来执行搜索
-        -->
    </application>

 </manifest>
--- a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="net.micode.notes"
    android:versionCode="1"
    android:versionName="0.1" >

    <uses-sdk
-        android:minSdkVersion="11"
-        android:targetSdkVersion="30" />
+        android:minSdkVersion="21"
+        android:targetSdkVersion="27" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@ -34,8 +19,9 @@
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <application
+        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
        android:debuggable="true"
-        android:icon="@drawable/icon_app"
+        android:icon="@drawable/icon_app_new"
        android:label="@string/app_name"
        android:testOnly="true" >
        <activity
@ -59,26 +45,21 @@
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
-        </activity>
+            android:windowSoftInputMode="adjustPan" />
        <activity
            android:name="net.micode.notes.ui.SettingPassword"
            android:configChanges="keyboardHidden|orientation|screenSize"
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
-        </activity>
+            android:windowSoftInputMode="adjustPan" />
        <activity
            android:name="net.micode.notes.ui.DeletingPassword"
            android:configChanges="keyboardHidden|orientation|screenSize"
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
-        </activity>
-
-        <!-- <activity -->
+            android:windowSoftInputMode="adjustPan" /> <!-- <activity -->
        <!-- android:name=".ui.SearchActivity" -->
        <!-- android:configChanges="keyboardHidden|orientation|screenSize" -->
        <!-- android:label="@string/app_name" -->
@ -86,7 +67,6 @@
        <!-- android:theme="@style/NoteTheme" -->
        <!-- android:windowSoftInputMode="adjustPan" > -->
        <!-- </activity> -->
-
        <activity
            android:name="net.micode.notes.ui.NotesListActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
@ -140,8 +120,7 @@
            android:name="net.micode.notes.data.NotesProvider"
            android:authorities="micode_notes"
            android:exported="false"
-            android:multiprocess="true" >
-        </provider>
+            android:multiprocess="true" />

        <receiver
            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
@ -175,36 +154,27 @@
            </intent-filter>
        </receiver>
        <receiver
-            android:name="net.micode.notes.ui.AlarmReceiver"
-            android:process=":remote" >
-        </receiver>
+            android:name="net.micode.notes.AlarmReceiver"
+            android:process=":remote" />

        <activity
            android:name="net.micode.notes.ui.AlarmAlertActivity"
            android:label="@string/app_name"
            android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-        </activity>
+            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
        <activity
-            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+            android:name="net.micode.notes.NotesPreferenceActivity"
            android:label="@string/preferences_title"
            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light" >
-        </activity>
+            android:theme="@android:style/Theme.Holo.Light" />

        <service
            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-            android:exported="false" >
-        </service>
+            android:exported="false" />

        <meta-data
            android:name="android.app.default_searchable"
            android:value=".ui.NoteEditActivity" />
-        <!--
-                    如果你想为你的应用程序的每个activity 都提供该search dialog, 那么将<meta-data>元素加入<application>中，
-                    通过这种方式, 每个activity 都继承了该值, 提供search dialog, 并把searches传送到同一个searchable activity.
-                    <meta-data>元素，它声明了使用哪个searchable activity来执行搜索
-        -->
    </application>

 </manifest>
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat
--- a/Show More
+++ b/Show More