diff --git a/src/Notes-master/.idea/misc.xml b/src/Notes-master/.idea/misc.xml
index ec46993..54a278f 100644
--- a/src/Notes-master/.idea/misc.xml
+++ b/src/Notes-master/.idea/misc.xml
@@ -24,7 +24,7 @@
         <entry key="..\:/project2/xiaomi_Note/src/Notes-master/app/src/main/res/xml/activity_login.xml" value="0.18645833333333334" />
         <entry key="..\:/project2/xiaomi_Note/src/Notes-master/app/src/main/res/xml/preferences.xml" value="0.1875" />
         <entry key="..\:/xiaomi/xiaomi_Note/src/Notes-master/app/src/main/res/menu/note_edit.xml" value="0.21388888888888888" />
-        <entry key="..\:/xiaomi/xiaomi_Note/src/Notes-master/app/src/main/res/menu/note_list.xml" value="0.1" />
+        <entry key="..\:/xiaomi/xiaomi_Note/src/Notes-master/app/src/main/res/menu/note_list.xml" value="0.264" />
         <entry key="..\:/xiaomi_Note/src/Notes-master/app/src/main/res/menu/note_edit.xml" value="0.1" />
       </map>
     </option>
diff --git a/src/Notes-master/.idea/workspace.xml b/src/Notes-master/.idea/workspace.xml
index 9a3a0da..ac4f09c 100644
--- a/src/Notes-master/.idea/workspace.xml
+++ b/src/Notes-master/.idea/workspace.xml
@@ -15,133 +15,36 @@
     <list default="true" id="e0079f3a-80a2-4216-a0ff-1482a6e40a07" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules/app/Notes-master.app.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/Notes-master.app.main.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugShaders/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugShaders/merger.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword$1.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword$1.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword$1.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/menu/note_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/note_list.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git 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
new file mode 100644
index 0000000..accb63b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ
diff --git 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
new file mode 100644
index 0000000..7afe73e
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ
diff --git 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
index 16b08c1..4e2973f 100644
--- 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,3 +1,4 @@
+<<<<<<< HEAD
 #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
@@ -103,3 +104,105 @@ net.micode.notes.app-main-10\:/xml/searchable.xml=D\:\\softproject\\xiaomi_Note\
 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
+=======
+#Wed Oct 26 00:43:15 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
+>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
diff --git 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
index 6e35917..47c2532 100644
--- 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,6 +7,7 @@
     <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>
+<<<<<<< HEAD
     <string name="LoginSetting">设置账户密码</string>
     <string msgid="4600421777120114993" name="abc_action_bar_home_description">"转到主屏幕"</string>
     <string msgid="1594238315039666878" name="abc_action_bar_up_description">"转到上一层级"</string>
@@ -35,6 +36,9 @@
     <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="LoginSetting">设置账号密码</string>
+>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
     <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
     <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
     <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
@@ -46,7 +50,11 @@
     <string name="call_record_folder_name">通话便签</string>
     <string name="datetime_dialog_cancel">取消</string>
     <string name="datetime_dialog_ok">设置</string>
+<<<<<<< HEAD
     <string name="delete_password">删除账户密码</string>
+=======
+    <string name="delete_password">删除账号密码</string>
+>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
     <string name="delete_remind_time_message">成功删除提醒</string>
     <string name="dummy_content">生活要五颜六色 不要乱七八糟</string>
     <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index dad8ead..f7b40da 100644
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -2668,7 +2668,11 @@
         <item>邮件</item>
     </string-array></file><file path="D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="LoginSetting">设置账户密码</string><string name="delete_password">删除账户密码</string><string name="menu_yourname1.0">背景：泷</string><string name="menu_yourname2.0">背景：叶</string><string name="menu_narutuo">背景：鼬</string><string name="app_name">你的日记</string><string name="dummy_content">生活要五颜六色 不要乱七八糟</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_font_style">选择字体</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><string name="menu_countallNotes">当前便签数量 </string><plurals name="search_results_title">
         <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+<<<<<<< HEAD
     </plurals></file><file path="D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
+=======
+    </plurals><string name="menu_countallNotes">便签数量 </string><string name="LoginSetting">设置账号密码</string><string name="delete_password">删除账号密码</string></file><file path="D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
+>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
         <item>短信</item>
         <item>郵件</item>
     </string-array></file><file path="D:\softproject\xiaomi_Note\src\Notes-master\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_font_style">选择字体</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
diff --git 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
index 63b9f70..d7db178 100644
--- 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,3 +1,4 @@
+<<<<<<< HEAD
 #Fri Oct 28 09:09:31 CST 2022
 path.4=13/classes.dex
 path.3=12/classes.dex
@@ -6,6 +7,11 @@ path.1=0/classes.dex
 path.7=5/classes.dex
 path.6=4/classes.dex
 path.5=15/classes.dex
+=======
+#Wed Oct 26 00:43:17 CST 2022
+base.0=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+renamed.0=classes.dex
+>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
 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
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index 1d2a5e5..6d53708 100644
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -6,12 +6,44 @@
                 {
                     "source": "C:\\Users\\86136\\.gradle\\caches\\transforms-3\\4886514668e3b342cb170031a2880e7d\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml",
                     "from": {
+<<<<<<< HEAD
                         "startLines": "2,6,10",
                         "startColumns": "4,4,4",
                         "startOffsets": "55,271,499",
                         "endLines": "5,9,13",
                         "endColumns": "12,12,12",
                         "endOffsets": "266,494,724"
+=======
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "startLines": "-1,44,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,2123,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2172,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,47,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,50,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,2166,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2218,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,432,505,571,644,694,734,782,830,875,932,986,1036,1087,1149,1217,1294,1353,1418,1481,1536,1596,1659,1713,1773,1826,1888,1973,2054,2104,2163,2206,2259,2312,2355,2406,2456,2516,2569,2620,2666,2714,2762,2808,2857,2904,2954,2999,3058,3110,3162,3205,3252,3308,3363,3418,3462,3504,3545,3595,3654,3705,3754,3803,3850,3897,3944,3989,4040,4093,4168,4227,4284,4358,4422,4491,4569,4679,4783,4856,4922,4977,5042,5107,5156,5239,5317,5355,5400,5448,5510,5567,5622,5681,5748,5806,5868,5916,5961,6009,6060,6126",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110",
+                        "endColumns": "14,47,72,65,72,49,39,47,47,44,56,53,49,50,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,427,500,566,639,689,729,777,825,870,927,981,1031,1082,1144,1212,1289,1348,1413,1476,1531,1591,1654,1708,1768,1821,1883,1968,2049,2099,2158,2201,2254,2307,2350,2401,2451,2511,2564,2615,2661,2709,2757,2803,2852,2899,2949,2994,3053,3105,3157,3200,3247,3303,3358,3413,3457,3499,3540,3590,3649,3700,3749,3798,3845,3892,3939,3984,4035,4088,4163,4222,4279,4353,4417,4486,4564,4674,4778,4851,4917,4972,5037,5102,5151,5234,5312,5350,5395,5443,5505,5562,5617,5676,5743,5801,5863,5911,5956,6004,6055,6121,6187"
+>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
                     }
                 }
             ]
@@ -202,6 +234,7 @@
                 {
                     "source": "D:\\softproject\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
+<<<<<<< HEAD
                         "startLines": "19,26",
                         "startColumns": "4,4",
                         "startOffsets": "758,1073",
@@ -3127,6 +3160,14 @@
                     "source": "C:\\Users\\86136\\.gradle\\caches\\transforms-3\\4886514668e3b342cb170031a2880e7d\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml",
                     "from": {
                         "startLines": "2,3",
+=======
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
                         "startColumns": "4,4",
                         "startOffsets": "55,212",
                         "endColumns": "156,134",
@@ -3136,7 +3177,54 @@
             ]
         },
         {
+<<<<<<< HEAD
             "outputFile": "net.micode.notes.app-merged_res-8:/values-ar_values-ar.arsc.flat",
+=======
+            "outputFile": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "from": {
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "730",
+                        "endLines": "21",
+                        "endColumns": "19",
+                        "endOffsets": "838"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "from": {
+                        "startLines": "123,73,72,71,70,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,62,29,30,81,37,115,69,65,39,45,50,40,61,60,59,54,53,51,52,56,55,57,46,68,58,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,27,79,87,92,91,93,86,85,84,83,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "6679,3697,3630,3556,3505,846,887,936,6219,6265,6624,6573,1225,3961,4030,3901,3834,3770,4704,4643,4579,4164,3068,1398,1452,4219,1805,6323,3445,3228,1917,2204,2455,1971,3007,2953,2901,2652,2603,2507,2556,2747,2699,2797,2248,3385,2848,3272,2160,2407,2350,2294,3172,2115,3129,2022,2064,3325,1346,1657,1755,1609,1707,1561,1515,1173,1119,5086,5026,5229,6142,5545,5475,5610,5689,5874,5800,5162,5419,5287,5353,4976,5979,6063,6534,6425,6376,6471,1288,4108,4519,4819,4760,4887,4470,4424,4375,4323,985,1052",
+                        "endLines": "125,73,72,71,70,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,62,29,30,81,37,115,69,65,39,45,50,40,61,60,59,54,53,51,52,56,55,57,46,68,58,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,27,79,87,92,91,93,86,85,84,83,22,23",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "6853,3764,3691,3624,3550,881,930,979,6259,6317,6673,6618,1282,4024,4102,3955,3895,3828,4754,4698,4637,4213,3123,1446,1509,4298,1880,6368,3499,3266,1965,2242,2501,2016,3062,3001,2947,2693,2646,2550,2597,2791,2741,2842,2288,3439,2895,3319,2198,2449,2401,2344,3222,2154,3166,2058,2109,3379,1392,1701,1799,1651,1749,1603,1555,1219,1167,5156,5080,5281,6211,5604,5539,5683,5794,5973,5868,5223,5469,5347,5413,5020,6057,6136,6567,6465,6419,6528,1340,4158,4573,4881,4813,4944,4513,4464,4418,4369,1046,1113"
+                    },
+                    "to": {
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2703,2750,2800,2845,2904,2956,3008,3051,3098,3154,3209,3264,3308,3350,3391,3441,3500,3551,3600,3649,3696,3743,3790,3835,3886,3939,4014,4073,4130,4204,4268,4337,4415,4525,4629,4702,4768,4823,4888,4953,5002,5085,5163,5201,5246,5294,5356,5413,5468,5527,5594,5652,5714,5762,5807,5855,5906,5972",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2698,2745,2795,2840,2899,2951,3003,3046,3093,3149,3204,3259,3303,3345,3386,3436,3495,3546,3595,3644,3691,3738,3785,3830,3881,3934,4009,4068,4125,4199,4263,4332,4410,4520,4624,4697,4763,4818,4883,4948,4997,5080,5158,5196,5241,5289,5351,5408,5463,5522,5589,5647,5709,5757,5802,5850,5901,5967,6033"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat",
+>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
             "map": [
                 {
                     "source": "C:\\Users\\86136\\.gradle\\caches\\transforms-3\\4886514668e3b342cb170031a2880e7d\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml",
diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index f8c421d..be4095e 100644
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -23,6 +23,7 @@
                 {
                     "source": "C:\\Users\\86136\\.gradle\\caches\\transforms-3\\4886514668e3b342cb170031a2880e7d\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
                     "from": {
+<<<<<<< HEAD
                         "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
                         "startOffsets": "105,201,296,396,478,575,681,757,833,924,1017,1115,1211,1306,1399,1494,1586,1677,1768,1846,1942,2038,2133,2230,2325,2423,2572,2666",
@@ -35,6 +36,21 @@
                         "startOffsets": "432,528,623,723,805,902,1008,1084,1160,1251,1344,1442,1538,1633,1726,1821,1913,2004,2095,2173,2269,2365,2460,2557,2652,2750,2899,8216",
                         "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
                         "endOffsets": "523,618,718,800,897,1003,1079,1155,1246,1339,1437,1533,1628,1721,1816,1908,1999,2090,2168,2264,2360,2455,2552,2647,2745,2894,2988,8289"
+=======
+                        "startLines": "-1,44,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,2123,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2172,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,47,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,50,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,2166,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2218,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,432,505,571,644,694,734,782,830,875,932,986,1036,1087,1149,1217,1294,1353,1418,1481,1536,1596,1659,1713,1773,1826,1888,1973,2054,2104,2163,2206,2259,2312,2355,2406,2456,2516,2569,2620,2666,2714,2762,2808,2857,2904,2954,2999,3058,3110,3162,3205,3252,3308,3363,3418,3462,3504,3545,3595,3654,3705,3754,3803,3850,3897,3944,3989,4040,4093,4168,4227,4284,4358,4422,4491,4569,4679,4783,4856,4922,4977,5042,5107,5156,5239,5317,5355,5400,5448,5510,5567,5622,5681,5748,5806,5868,5916,5961,6009,6060,6126",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110",
+                        "endColumns": "14,47,72,65,72,49,39,47,47,44,56,53,49,50,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,427,500,566,639,689,729,777,825,870,927,981,1031,1082,1144,1212,1289,1348,1413,1476,1531,1591,1654,1708,1768,1821,1883,1968,2049,2099,2158,2201,2254,2307,2350,2401,2451,2511,2564,2615,2661,2709,2757,2803,2852,2899,2949,2994,3053,3105,3157,3200,3247,3303,3358,3413,3457,3499,3540,3590,3649,3700,3749,3798,3845,3892,3939,3984,4035,4088,4163,4222,4279,4353,4417,4486,4564,4674,4778,4851,4917,4972,5037,5102,5151,5234,5312,5350,5395,5443,5505,5562,5617,5676,5743,5801,5863,5911,5956,6004,6055,6121,6187"
+>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
                     }
                 },
                 {
diff --git a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt
index 9bb7b64..31624e0 100644
--- a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 int anim abc_fade_in 0x7f010000
 int anim abc_fade_out 0x7f010001
 int anim abc_grow_fade_in_from_bottom 0x7f010002
@@ -1938,3 +1939,311 @@ int xml preferences 0x7f110000
 int xml searchable 0x7f110001
 int xml widget_2x_info 0x7f110002
 int xml widget_4x_info 0x7f110003
+=======
+int array format_for_exported_note 0x7f010000
+int array menu_share_ways 0x7f010001
+int color primary_text_dark 0x7f020000
+int color secondary_text_dark 0x7f020001
+int color user_query_highlight 0x7f020002
+int dimen text_font_size_large 0x7f030000
+int dimen text_font_size_medium 0x7f030001
+int dimen text_font_size_normal 0x7f030002
+int dimen text_font_size_small 0x7f030003
+int dimen text_font_size_super 0x7f030004
+int drawable bg_btn_set_color 0x7f040000
+int drawable bg_color_btn_mask 0x7f040001
+int drawable call_record 0x7f040002
+int drawable clock 0x7f040003
+int drawable delete 0x7f040004
+int drawable dropdown_icon 0x7f040005
+int drawable edit_blue 0x7f040006
+int drawable edit_green 0x7f040007
+int drawable edit_red 0x7f040008
+int drawable edit_title_blue 0x7f040009
+int drawable edit_title_green 0x7f04000a
+int drawable edit_title_red 0x7f04000b
+int drawable edit_title_white 0x7f04000c
+int drawable edit_title_yellow 0x7f04000d
+int drawable edit_white 0x7f04000e
+int drawable edit_yellow 0x7f04000f
+int drawable font_large 0x7f040010
+int drawable font_normal 0x7f040011
+int drawable font_size_selector_bg 0x7f040012
+int drawable font_small 0x7f040013
+int drawable font_super 0x7f040014
+int drawable icon_app 0x7f040015
+int drawable list_background 0x7f040016
+int drawable list_blue_down 0x7f040017
+int drawable list_blue_middle 0x7f040018
+int drawable list_blue_single 0x7f040019
+int drawable list_blue_up 0x7f04001a
+int drawable list_folder 0x7f04001b
+int drawable list_footer_bg 0x7f04001c
+int drawable list_green_down 0x7f04001d
+int drawable list_green_middle 0x7f04001e
+int drawable list_green_single 0x7f04001f
+int drawable list_green_up 0x7f040020
+int drawable list_red_down 0x7f040021
+int drawable list_red_middle 0x7f040022
+int drawable list_red_single 0x7f040023
+int drawable list_red_up 0x7f040024
+int drawable list_white_down 0x7f040025
+int drawable list_white_middle 0x7f040026
+int drawable list_white_single 0x7f040027
+int drawable list_white_up 0x7f040028
+int drawable list_yellow_down 0x7f040029
+int drawable list_yellow_middle 0x7f04002a
+int drawable list_yellow_single 0x7f04002b
+int drawable list_yellow_up 0x7f04002c
+int drawable menu_delete 0x7f04002d
+int drawable menu_move 0x7f04002e
+int drawable new_note 0x7f04002f
+int drawable new_note_normal 0x7f040030
+int drawable new_note_pressed 0x7f040031
+int drawable note_edit_color_selector_panel 0x7f040032
+int drawable notification 0x7f040033
+int drawable search_result 0x7f040034
+int drawable selected 0x7f040035
+int drawable title_alert 0x7f040036
+int drawable title_bar_bg 0x7f040037
+int drawable widget_2x_blue 0x7f040038
+int drawable widget_2x_green 0x7f040039
+int drawable widget_2x_red 0x7f04003a
+int drawable widget_2x_white 0x7f04003b
+int drawable widget_2x_yellow 0x7f04003c
+int drawable widget_4x_blue 0x7f04003d
+int drawable widget_4x_green 0x7f04003e
+int drawable widget_4x_red 0x7f04003f
+int drawable widget_4x_white 0x7f040040
+int drawable widget_4x_yellow 0x7f040041
+int id Acknowledged 0x7f050000
+int id Dt_Acknowledged 0x7f050001
+int id LoginSetting 0x7f050002
+int id account_dialog_subtitle 0x7f050003
+int id account_dialog_title 0x7f050004
+int id ack_password 0x7f050005
+int id acknowledge 0x7f050006
+int id action_select_all 0x7f050007
+int id amPm 0x7f050008
+int id btn_new_note 0x7f050009
+int id btn_set_bg_color 0x7f05000a
+int id cb_edit_item 0x7f05000b
+int id date 0x7f05000c
+int id delete 0x7f05000d
+int id delete_password 0x7f05000e
+int id et_edit_text 0x7f05000f
+int id et_foler_name 0x7f050010
+int id font_size_selector 0x7f050011
+int id hour 0x7f050012
+int id iv_alert_icon 0x7f050013
+int id iv_bg_blue 0x7f050014
+int id iv_bg_blue_select 0x7f050015
+int id iv_bg_green 0x7f050016
+int id iv_bg_green_select 0x7f050017
+int id iv_bg_red 0x7f050018
+int id iv_bg_red_select 0x7f050019
+int id iv_bg_white 0x7f05001a
+int id iv_bg_white_select 0x7f05001b
+int id iv_bg_yellow 0x7f05001c
+int id iv_bg_yellow_select 0x7f05001d
+int id iv_large_select 0x7f05001e
+int id iv_medium_select 0x7f05001f
+int id iv_small_select 0x7f050020
+int id iv_super_select 0x7f050021
+int id lg_password 0x7f050022
+int id ll_font_large 0x7f050023
+int id ll_font_normal 0x7f050024
+int id ll_font_small 0x7f050025
+int id ll_font_super 0x7f050026
+int id login 0x7f050027
+int id menu_alert 0x7f050028
+int id menu_countallNotes 0x7f050029
+int id menu_delete 0x7f05002a
+int id menu_delete_remind 0x7f05002b
+int id menu_export_text 0x7f05002c
+int id menu_font_select 0x7f05002d
+int id menu_font_size 0x7f05002e
+int id menu_list_mode 0x7f05002f
+int id menu_new_folder 0x7f050030
+int id menu_new_note 0x7f050031
+int id menu_search 0x7f050032
+int id menu_send_to_desktop 0x7f050033
+int id menu_setting 0x7f050034
+int id menu_share 0x7f050035
+int id menu_sync 0x7f050036
+int id minute 0x7f050037
+int id move 0x7f050038
+int id navigation_bar 0x7f050039
+int id new_password 0x7f05003a
+int id note_bg_color_selector 0x7f05003b
+int id note_edit_list 0x7f05003c
+int id note_edit_view 0x7f05003d
+int id note_item 0x7f05003e
+int id note_title 0x7f05003f
+int id notes_list 0x7f050040
+int id old_password 0x7f050041
+int id password 0x7f050042
+int id password_ack 0x7f050043
+int id prefenerece_sync_status_textview 0x7f050044
+int id preference_sync_button 0x7f050045
+int id selection_menu 0x7f050046
+int id sv_note_edit 0x7f050047
+int id thepassword 0x7f050048
+int id tv_alert_date 0x7f050049
+int id tv_folder_name 0x7f05004a
+int id tv_modified_date 0x7f05004b
+int id tv_name 0x7f05004c
+int id tv_time 0x7f05004d
+int id tv_title 0x7f05004e
+int id tv_title_bar 0x7f05004f
+int id widget_bg_image 0x7f050050
+int id widget_text 0x7f050051
+int layout account_dialog_title 0x7f060000
+int layout activity_change_password 0x7f060001
+int layout activity_delete_password 0x7f060002
+int layout activity_login 0x7f060003
+int layout activity_set_loginpassword 0x7f060004
+int layout add_account_text 0x7f060005
+int layout datetime_picker 0x7f060006
+int layout dialog_edit_text 0x7f060007
+int layout folder_list_item 0x7f060008
+int layout note_edit 0x7f060009
+int layout note_edit_list_item 0x7f06000a
+int layout note_item 0x7f06000b
+int layout note_list 0x7f06000c
+int layout note_list_dropdown_menu 0x7f06000d
+int layout note_list_footer 0x7f06000e
+int layout settings_header 0x7f06000f
+int layout widget_2x 0x7f060010
+int layout widget_4x 0x7f060011
+int menu call_note_edit 0x7f070000
+int menu call_record_folder 0x7f070001
+int menu note_edit 0x7f070002
+int menu note_list 0x7f070003
+int menu note_list_dropdown 0x7f070004
+int menu note_list_options 0x7f070005
+int menu sub_folder 0x7f070006
+int plurals search_results_title 0x7f080000
+int raw introduction 0x7f090000
+int string LoginSetting 0x7f0a0000
+int string alert_message_delete_folder 0x7f0a0001
+int string alert_message_delete_note 0x7f0a0002
+int string alert_message_delete_notes 0x7f0a0003
+int string alert_title_delete 0x7f0a0004
+int string app_name 0x7f0a0005
+int string app_widget2x2 0x7f0a0006
+int string app_widget4x4 0x7f0a0007
+int string button_delete 0x7f0a0008
+int string call_record_folder_name 0x7f0a0009
+int string datetime_dialog_cancel 0x7f0a000a
+int string datetime_dialog_ok 0x7f0a000b
+int string delete_password 0x7f0a000c
+int string delete_remind_time_message 0x7f0a000d
+int string error_note_empty_for_clock 0x7f0a000e
+int string error_note_empty_for_send_to_desktop 0x7f0a000f
+int string error_note_not_exist 0x7f0a0010
+int string error_sdcard_export 0x7f0a0011
+int string error_sdcard_unmounted 0x7f0a0012
+int string error_sync_cancelled 0x7f0a0013
+int string error_sync_internal 0x7f0a0014
+int string error_sync_network 0x7f0a0015
+int string failed_sdcard_export 0x7f0a0016
+int string file_name_txt_format 0x7f0a0017
+int string file_path 0x7f0a0018
+int string folder_exist 0x7f0a0019
+int string format_date_ymd 0x7f0a001a
+int string format_datetime_mdhm 0x7f0a001b
+int string format_exported_file_location 0x7f0a001c
+int string format_folder_files_count 0x7f0a001d
+int string format_move_notes_to_folder 0x7f0a001e
+int string hint_foler_name 0x7f0a001f
+int string info_note_enter_desktop 0x7f0a0020
+int string menu_alert 0x7f0a0021
+int string menu_countallNotes 0x7f0a0022
+int string menu_create_folder 0x7f0a0023
+int string menu_delete 0x7f0a0024
+int string menu_deselect_all 0x7f0a0025
+int string menu_export_text 0x7f0a0026
+int string menu_folder_change_name 0x7f0a0027
+int string menu_folder_delete 0x7f0a0028
+int string menu_folder_view 0x7f0a0029
+int string menu_font_large 0x7f0a002a
+int string menu_font_normal 0x7f0a002b
+int string menu_font_size 0x7f0a002c
+int string menu_font_small 0x7f0a002d
+int string menu_font_style 0x7f0a002e
+int string menu_font_super 0x7f0a002f
+int string menu_list_mode 0x7f0a0030
+int string menu_move 0x7f0a0031
+int string menu_move_parent_folder 0x7f0a0032
+int string menu_normal_mode 0x7f0a0033
+int string menu_remove_remind 0x7f0a0034
+int string menu_search 0x7f0a0035
+int string menu_select_all 0x7f0a0036
+int string menu_select_none 0x7f0a0037
+int string menu_select_title 0x7f0a0038
+int string menu_send_to_desktop 0x7f0a0039
+int string menu_setting 0x7f0a003a
+int string menu_share 0x7f0a003b
+int string menu_sync 0x7f0a003c
+int string menu_sync_cancel 0x7f0a003d
+int string menu_title_select_folder 0x7f0a003e
+int string note_alert_expired 0x7f0a003f
+int string note_link_email 0x7f0a0040
+int string note_link_other 0x7f0a0041
+int string note_link_tel 0x7f0a0042
+int string note_link_web 0x7f0a0043
+int string notealert_enter 0x7f0a0044
+int string notealert_ok 0x7f0a0045
+int string notelist_menu_new 0x7f0a0046
+int string notelist_string_info 0x7f0a0047
+int string preferences_account_summary 0x7f0a0048
+int string preferences_account_title 0x7f0a0049
+int string preferences_add_account 0x7f0a004a
+int string preferences_bg_random_appear_title 0x7f0a004b
+int string preferences_button_sync_cancel 0x7f0a004c
+int string preferences_button_sync_immediately 0x7f0a004d
+int string preferences_dialog_change_account_title 0x7f0a004e
+int string preferences_dialog_change_account_warn_msg 0x7f0a004f
+int string preferences_dialog_select_account_tips 0x7f0a0050
+int string preferences_dialog_select_account_title 0x7f0a0051
+int string preferences_last_sync_time 0x7f0a0052
+int string preferences_last_sync_time_format 0x7f0a0053
+int string preferences_menu_cancel 0x7f0a0054
+int string preferences_menu_change_account 0x7f0a0055
+int string preferences_menu_remove_account 0x7f0a0056
+int string preferences_title 0x7f0a0057
+int string preferences_toast_cannot_change_account 0x7f0a0058
+int string preferences_toast_success_set_accout 0x7f0a0059
+int string search 0x7f0a005a
+int string search_hint 0x7f0a005b
+int string search_label 0x7f0a005c
+int string search_setting_description 0x7f0a005d
+int string set_remind_time_message 0x7f0a005e
+int string success_sdcard_export 0x7f0a005f
+int string success_sync_account 0x7f0a0060
+int string sync_progress_init_list 0x7f0a0061
+int string sync_progress_login 0x7f0a0062
+int string sync_progress_syncing 0x7f0a0063
+int string ticker_cancel 0x7f0a0064
+int string ticker_fail 0x7f0a0065
+int string ticker_success 0x7f0a0066
+int string ticker_syncing 0x7f0a0067
+int string widget_havenot_content 0x7f0a0068
+int string widget_under_visit_mode 0x7f0a0069
+int style HighlightTextAppearancePrimary 0x7f0b0000
+int style HighlightTextAppearanceSecondary 0x7f0b0001
+int style NoteActionBarStyle 0x7f0b0002
+int style NoteTheme 0x7f0b0003
+int style TextAppearanceLarge 0x7f0b0004
+int style TextAppearanceMedium 0x7f0b0005
+int style TextAppearanceNormal 0x7f0b0006
+int style TextAppearancePrimaryItem 0x7f0b0007
+int style TextAppearanceSecondaryItem 0x7f0b0008
+int style TextAppearanceSuper 0x7f0b0009
+int style TextAppearanceUnderMenuIcon 0x7f0b000a
+int xml preferences 0x7f0c0000
+int xml searchable 0x7f0c0001
+int xml widget_2x_info 0x7f0c0002
+int xml widget_4x_info 0x7f0c0003
+>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
diff --git a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index d972a60..bd0dc1f 100644
--- a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 net.micode.notes:xml/widget_2x_info = 0x7f110002
 net.micode.notes:xml/searchable = 0x7f110001
 net.micode.notes:styleable/ViewStubCompat = 0x7f10002c
@@ -1521,3 +1522,311 @@ net.micode.notes:styleable/AlertDialog = 0x7f100006
 net.micode.notes:attr/radioButtonStyle = 0x7f0300bd
 net.micode.notes:anim/abc_popup_enter = 0x7f010003
 net.micode.notes:color/button_material_light = 0x7f050026
+=======
+net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0058
+net.micode.notes:string/menu_select_all = 0x7f0a0036
+net.micode.notes:string/menu_select_none = 0x7f0a0037
+net.micode.notes:style/NoteTheme = 0x7f0b0003
+net.micode.notes:drawable/list_yellow_single = 0x7f04002b
+net.micode.notes:id/amPm = 0x7f050008
+net.micode.notes:string/ticker_fail = 0x7f0a0065
+net.micode.notes:string/success_sdcard_export = 0x7f0a005f
+net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
+net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
+net.micode.notes:string/error_sync_network = 0x7f0a0015
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a0020
+net.micode.notes:string/preferences_account_summary = 0x7f0a0048
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0053
+net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
+net.micode.notes:string/menu_alert = 0x7f0a0021
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0012
+net.micode.notes:id/menu_search = 0x7f050032
+net.micode.notes:dimen/text_font_size_normal = 0x7f030002
+net.micode.notes:layout/note_edit_list_item = 0x7f06000a
+net.micode.notes:string/set_remind_time_message = 0x7f0a005e
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004f
+net.micode.notes:id/widget_text = 0x7f050051
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0056
+net.micode.notes:string/ticker_success = 0x7f0a0066
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
+net.micode.notes:string/sync_progress_login = 0x7f0a0062
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0050
+net.micode.notes:string/ticker_cancel = 0x7f0a0064
+net.micode.notes:menu/note_list = 0x7f070003
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0059
+net.micode.notes:string/ticker_syncing = 0x7f0a0067
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004e
+net.micode.notes:layout/activity_login = 0x7f060003
+net.micode.notes:string/menu_font_large = 0x7f0a002a
+net.micode.notes:id/tv_alert_date = 0x7f050049
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004d
+net.micode.notes:id/tv_folder_name = 0x7f05004a
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0055
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004c
+net.micode.notes:string/preferences_account_title = 0x7f0a0049
+net.micode.notes:string/notealert_enter = 0x7f0a0044
+net.micode.notes:string/preferences_title = 0x7f0a0057
+net.micode.notes:string/note_alert_expired = 0x7f0a003f
+net.micode.notes:string/notelist_menu_new = 0x7f0a0046
+net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
+net.micode.notes:string/notealert_ok = 0x7f0a0045
+net.micode.notes:string/folder_exist = 0x7f0a0019
+net.micode.notes:string/note_link_other = 0x7f0a0041
+net.micode.notes:string/preferences_add_account = 0x7f0a004a
+net.micode.notes:string/preferences_menu_cancel = 0x7f0a0054
+net.micode.notes:string/note_link_web = 0x7f0a0043
+net.micode.notes:string/note_link_tel = 0x7f0a0042
+net.micode.notes:string/sync_progress_init_list = 0x7f0a0061
+net.micode.notes:menu/note_edit = 0x7f070002
+net.micode.notes:layout/folder_list_item = 0x7f060008
+net.micode.notes:string/menu_select_title = 0x7f0a0038
+net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000e
+net.micode.notes:string/note_link_email = 0x7f0a0040
+net.micode.notes:menu/call_record_folder = 0x7f070001
+net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:id/menu_export_text = 0x7f05002c
+net.micode.notes:string/menu_sync = 0x7f0a003c
+net.micode.notes:string/menu_font_super = 0x7f0a002f
+net.micode.notes:string/menu_list_mode = 0x7f0a0030
+net.micode.notes:string/menu_export_text = 0x7f0a0026
+net.micode.notes:string/search_hint = 0x7f0a005b
+net.micode.notes:string/format_folder_files_count = 0x7f0a001d
+net.micode.notes:string/widget_havenot_content = 0x7f0a0068
+net.micode.notes:string/notelist_string_info = 0x7f0a0047
+net.micode.notes:id/tv_name = 0x7f05004c
+net.micode.notes:layout/note_item = 0x7f06000b
+net.micode.notes:string/search_label = 0x7f0a005c
+net.micode.notes:string/format_exported_file_location = 0x7f0a001c
+net.micode.notes:id/menu_new_note = 0x7f050031
+net.micode.notes:string/file_path = 0x7f0a0018
+net.micode.notes:string/menu_sync_cancel = 0x7f0a003d
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a0039
+net.micode.notes:string/error_sync_internal = 0x7f0a0014
+net.micode.notes:layout/settings_header = 0x7f06000f
+net.micode.notes:string/button_delete = 0x7f0a0008
+net.micode.notes:string/menu_create_folder = 0x7f0a0023
+net.micode.notes:string/error_sdcard_export = 0x7f0a0011
+net.micode.notes:string/menu_setting = 0x7f0a003a
+net.micode.notes:string/delete_password = 0x7f0a000c
+net.micode.notes:id/menu_delete_remind = 0x7f05002b
+net.micode.notes:string/datetime_dialog_ok = 0x7f0a000b
+net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001e
+net.micode.notes:string/alert_message_delete_folder = 0x7f0a0001
+net.micode.notes:string/LoginSetting = 0x7f0a0000
+net.micode.notes:string/hint_foler_name = 0x7f0a001f
+net.micode.notes:drawable/list_yellow_middle = 0x7f04002a
+net.micode.notes:id/widget_bg_image = 0x7f050050
+net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:id/iv_bg_red = 0x7f050018
+net.micode.notes:drawable/list_blue_down = 0x7f040017
+net.micode.notes:xml/searchable = 0x7f0c0001
+net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
+net.micode.notes:menu/note_list_options = 0x7f070005
+net.micode.notes:string/menu_font_size = 0x7f0a002c
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:string/app_name = 0x7f0a0005
+net.micode.notes:layout/widget_4x = 0x7f060011
+net.micode.notes:string/menu_folder_view = 0x7f0a0029
+net.micode.notes:layout/note_list = 0x7f06000c
+net.micode.notes:drawable/font_super = 0x7f040014
+net.micode.notes:string/menu_share = 0x7f0a003b
+net.micode.notes:id/menu_share = 0x7f050035
+net.micode.notes:string/app_widget4x4 = 0x7f0a0007
+net.micode.notes:string/file_name_txt_format = 0x7f0a0017
+net.micode.notes:id/menu_setting = 0x7f050034
+net.micode.notes:color/primary_text_dark = 0x7f020000
+net.micode.notes:layout/datetime_picker = 0x7f060006
+net.micode.notes:id/menu_font_select = 0x7f05002d
+net.micode.notes:string/alert_message_delete_note = 0x7f0a0002
+net.micode.notes:layout/activity_set_loginpassword = 0x7f060004
+net.micode.notes:layout/dialog_edit_text = 0x7f060007
+net.micode.notes:drawable/new_note_pressed = 0x7f040031
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
+net.micode.notes:drawable/widget_4x_white = 0x7f040040
+net.micode.notes:id/menu_new_folder = 0x7f050030
+net.micode.notes:layout/activity_delete_password = 0x7f060002
+net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
+net.micode.notes:layout/account_dialog_title = 0x7f060000
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0051
+net.micode.notes:drawable/list_green_up = 0x7f040020
+net.micode.notes:layout/add_account_text = 0x7f060005
+net.micode.notes:id/tv_title_bar = 0x7f05004f
+net.micode.notes:menu/note_list_dropdown = 0x7f070004
+net.micode.notes:id/iv_bg_blue_select = 0x7f050015
+net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032
+net.micode.notes:id/thepassword = 0x7f050048
+net.micode.notes:string/menu_folder_change_name = 0x7f0a0027
+net.micode.notes:id/sv_note_edit = 0x7f050047
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050044
+net.micode.notes:drawable/list_folder = 0x7f04001b
+net.micode.notes:id/password_ack = 0x7f050043
+net.micode.notes:id/old_password = 0x7f050041
+net.micode.notes:id/note_edit_view = 0x7f05003d
+net.micode.notes:id/iv_bg_yellow_select = 0x7f05001d
+net.micode.notes:id/LoginSetting = 0x7f050002
+net.micode.notes:id/note_bg_color_selector = 0x7f05003b
+net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000f
+net.micode.notes:drawable/font_small = 0x7f040013
+net.micode.notes:id/navigation_bar = 0x7f050039
+net.micode.notes:raw/introduction = 0x7f090000
+net.micode.notes:id/move = 0x7f050038
+net.micode.notes:id/ll_font_normal = 0x7f050024
+net.micode.notes:id/minute = 0x7f050037
+net.micode.notes:id/menu_sync = 0x7f050036
+net.micode.notes:layout/note_list_footer = 0x7f06000e
+net.micode.notes:id/menu_alert = 0x7f050028
+net.micode.notes:id/tv_time = 0x7f05004d
+net.micode.notes:id/iv_bg_green = 0x7f050016
+net.micode.notes:layout/activity_change_password = 0x7f060001
+net.micode.notes:string/error_sync_cancelled = 0x7f0a0013
+net.micode.notes:id/login = 0x7f050027
+net.micode.notes:id/et_foler_name = 0x7f050010
+net.micode.notes:id/ll_font_small = 0x7f050025
+net.micode.notes:id/iv_super_select = 0x7f050021
+net.micode.notes:drawable/widget_2x_white = 0x7f04003b
+net.micode.notes:id/iv_medium_select = 0x7f05001f
+net.micode.notes:string/menu_font_normal = 0x7f0a002b
+net.micode.notes:id/new_password = 0x7f05003a
+net.micode.notes:id/iv_large_select = 0x7f05001e
+net.micode.notes:id/ll_font_super = 0x7f050026
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000d
+net.micode.notes:string/format_date_ymd = 0x7f0a001a
+net.micode.notes:string/menu_search = 0x7f0a0035
+net.micode.notes:string/alert_title_delete = 0x7f0a0004
+net.micode.notes:id/iv_bg_white = 0x7f05001a
+net.micode.notes:string/success_sync_account = 0x7f0a0060
+net.micode.notes:id/delete_password = 0x7f05000e
+net.micode.notes:drawable/list_blue_up = 0x7f04001a
+net.micode.notes:id/date = 0x7f05000c
+net.micode.notes:string/menu_deselect_all = 0x7f0a0025
+net.micode.notes:string/search = 0x7f0a005a
+net.micode.notes:id/font_size_selector = 0x7f050011
+net.micode.notes:id/notes_list = 0x7f050040
+net.micode.notes:id/btn_set_bg_color = 0x7f05000a
+net.micode.notes:id/iv_bg_yellow = 0x7f05001c
+net.micode.notes:id/iv_bg_red_select = 0x7f050019
+net.micode.notes:id/et_edit_text = 0x7f05000f
+net.micode.notes:string/menu_move = 0x7f0a0031
+net.micode.notes:id/action_select_all = 0x7f050007
+net.micode.notes:id/acknowledge = 0x7f050006
+net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
+net.micode.notes:drawable/widget_4x_red = 0x7f04003f
+net.micode.notes:drawable/edit_blue = 0x7f040006
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a0032
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0016
+net.micode.notes:id/ack_password = 0x7f050005
+net.micode.notes:id/account_dialog_title = 0x7f050004
+net.micode.notes:id/ll_font_large = 0x7f050023
+net.micode.notes:drawable/list_red_single = 0x7f040023
+net.micode.notes:id/delete = 0x7f05000d
+net.micode.notes:drawable/title_bar_bg = 0x7f040037
+net.micode.notes:id/Dt_Acknowledged = 0x7f050001
+net.micode.notes:drawable/widget_2x_green = 0x7f040039
+net.micode.notes:drawable/title_alert = 0x7f040036
+net.micode.notes:drawable/widget_2x_blue = 0x7f040038
+net.micode.notes:drawable/widget_4x_green = 0x7f04003e
+net.micode.notes:drawable/list_white_down = 0x7f040025
+net.micode.notes:drawable/dropdown_icon = 0x7f040005
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a0052
+net.micode.notes:drawable/new_note_normal = 0x7f040030
+net.micode.notes:string/call_record_folder_name = 0x7f0a0009
+net.micode.notes:drawable/new_note = 0x7f04002f
+net.micode.notes:drawable/edit_title_white = 0x7f04000c
+net.micode.notes:drawable/menu_delete = 0x7f04002d
+net.micode.notes:id/cb_edit_item = 0x7f05000b
+net.micode.notes:xml/widget_4x_info = 0x7f0c0003
+net.micode.notes:drawable/list_yellow_up = 0x7f04002c
+net.micode.notes:drawable/widget_2x_red = 0x7f04003a
+net.micode.notes:id/note_edit_list = 0x7f05003c
+net.micode.notes:drawable/list_yellow_down = 0x7f040029
+net.micode.notes:plurals/search_results_title = 0x7f080000
+net.micode.notes:drawable/selected = 0x7f040035
+net.micode.notes:drawable/list_white_middle = 0x7f040026
+net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
+net.micode.notes:layout/note_edit = 0x7f060009
+net.micode.notes:id/hour = 0x7f050012
+net.micode.notes:id/iv_bg_white_select = 0x7f05001b
+net.micode.notes:drawable/list_red_up = 0x7f040024
+net.micode.notes:id/note_item = 0x7f05003e
+net.micode.notes:id/Acknowledged = 0x7f050000
+net.micode.notes:drawable/list_red_down = 0x7f040021
+net.micode.notes:id/menu_font_size = 0x7f05002e
+net.micode.notes:id/iv_bg_blue = 0x7f050014
+net.micode.notes:drawable/list_green_middle = 0x7f04001e
+net.micode.notes:drawable/list_footer_bg = 0x7f04001c
+net.micode.notes:string/sync_progress_syncing = 0x7f0a0063
+net.micode.notes:drawable/font_normal = 0x7f040011
+net.micode.notes:drawable/list_blue_middle = 0x7f040018
+net.micode.notes:drawable/list_white_single = 0x7f040027
+net.micode.notes:drawable/list_white_up = 0x7f040028
+net.micode.notes:string/menu_remove_remind = 0x7f0a0034
+net.micode.notes:drawable/list_green_down = 0x7f04001d
+net.micode.notes:id/preference_sync_button = 0x7f050045
+net.micode.notes:layout/widget_2x = 0x7f060010
+net.micode.notes:dimen/text_font_size_super = 0x7f030004
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004b
+net.micode.notes:string/alert_message_delete_notes = 0x7f0a0003
+net.micode.notes:string/menu_title_select_folder = 0x7f0a003e
+net.micode.notes:string/menu_folder_delete = 0x7f0a0028
+net.micode.notes:drawable/clock = 0x7f040003
+net.micode.notes:id/menu_delete = 0x7f05002a
+net.micode.notes:drawable/icon_app = 0x7f040015
+net.micode.notes:drawable/edit_yellow = 0x7f04000f
+net.micode.notes:string/menu_font_style = 0x7f0a002e
+net.micode.notes:drawable/list_blue_single = 0x7f040019
+net.micode.notes:drawable/list_red_middle = 0x7f040022
+net.micode.notes:string/menu_normal_mode = 0x7f0a0033
+net.micode.notes:drawable/edit_title_blue = 0x7f040009
+net.micode.notes:string/menu_delete = 0x7f0a0024
+net.micode.notes:drawable/list_background = 0x7f040016
+net.micode.notes:id/password = 0x7f050042
+net.micode.notes:string/format_datetime_mdhm = 0x7f0a001b
+net.micode.notes:id/menu_send_to_desktop = 0x7f050033
+net.micode.notes:drawable/search_result = 0x7f040034
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000a
+net.micode.notes:id/tv_modified_date = 0x7f05004b
+net.micode.notes:string/menu_font_small = 0x7f0a002d
+net.micode.notes:drawable/font_large = 0x7f040010
+net.micode.notes:id/iv_alert_icon = 0x7f050013
+net.micode.notes:id/lg_password = 0x7f050022
+net.micode.notes:drawable/list_green_single = 0x7f04001f
+net.micode.notes:xml/widget_2x_info = 0x7f0c0002
+net.micode.notes:drawable/edit_white = 0x7f04000e
+net.micode.notes:drawable/menu_move = 0x7f04002e
+net.micode.notes:id/btn_new_note = 0x7f050009
+net.micode.notes:drawable/edit_title_red = 0x7f04000b
+net.micode.notes:id/menu_countallNotes = 0x7f050029
+net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
+net.micode.notes:string/search_setting_description = 0x7f0a005d
+net.micode.notes:id/menu_list_mode = 0x7f05002f
+net.micode.notes:dimen/text_font_size_medium = 0x7f030001
+net.micode.notes:id/iv_small_select = 0x7f050020
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a0069
+net.micode.notes:color/user_query_highlight = 0x7f020002
+net.micode.notes:drawable/edit_red = 0x7f040008
+net.micode.notes:drawable/edit_green = 0x7f040007
+net.micode.notes:string/app_widget2x2 = 0x7f0a0006
+net.micode.notes:id/tv_title = 0x7f05004e
+net.micode.notes:drawable/delete = 0x7f040004
+net.micode.notes:string/menu_countallNotes = 0x7f0a0022
+net.micode.notes:drawable/edit_title_green = 0x7f04000a
+net.micode.notes:drawable/widget_4x_blue = 0x7f04003d
+net.micode.notes:id/iv_bg_green_select = 0x7f050017
+net.micode.notes:string/error_note_not_exist = 0x7f0a0010
+net.micode.notes:array/menu_share_ways = 0x7f010001
+net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
+net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
+net.micode.notes:dimen/text_font_size_small = 0x7f030003
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000d
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:id/selection_menu = 0x7f050046
+net.micode.notes:id/account_dialog_subtitle = 0x7f050003
+net.micode.notes:drawable/call_record = 0x7f040002
+net.micode.notes:drawable/notification = 0x7f040033
+net.micode.notes:color/secondary_text_dark = 0x7f020001
+net.micode.notes:id/note_title = 0x7f05003f
+net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
+net.micode.notes:array/format_for_exported_note = 0x7f010000
+>>>>>>> 2b2328f5b8a1846b43a22b1373b9032f35998ae7
diff --git a/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml
index c9dfe37..70b930d 100644
--- a/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml
@@ -52,6 +52,9 @@
 
 
     <string name="menu_search">搜索</string>
+    <string name="LoginSetting">设置账号密码</string>
+    <string name="delete_password">删除账号密码</string>
+
     <string name="menu_delete">删除</string>
     <string name="menu_move">移动到文件夹</string>
     <string name="menu_select_title">选中了 %d 项</string>