diff --git a/代码解读/MiNotes-master/.gradle/6.5/executionHistory/executionHistory.bin b/代码解读/MiNotes-master/.gradle/6.5/executionHistory/executionHistory.bin index 46324a9..4fe90af 100644 Binary files a/代码解读/MiNotes-master/.gradle/6.5/executionHistory/executionHistory.bin and b/代码解读/MiNotes-master/.gradle/6.5/executionHistory/executionHistory.bin differ diff --git a/代码解读/MiNotes-master/.gradle/6.5/executionHistory/executionHistory.lock b/代码解读/MiNotes-master/.gradle/6.5/executionHistory/executionHistory.lock index 25235fa..422d040 100644 Binary files a/代码解读/MiNotes-master/.gradle/6.5/executionHistory/executionHistory.lock and b/代码解读/MiNotes-master/.gradle/6.5/executionHistory/executionHistory.lock differ diff --git a/代码解读/MiNotes-master/.gradle/6.5/fileHashes/fileHashes.bin b/代码解读/MiNotes-master/.gradle/6.5/fileHashes/fileHashes.bin index 7241b88..b42e037 100644 Binary files a/代码解读/MiNotes-master/.gradle/6.5/fileHashes/fileHashes.bin and b/代码解读/MiNotes-master/.gradle/6.5/fileHashes/fileHashes.bin differ diff --git a/代码解读/MiNotes-master/.gradle/6.5/fileHashes/fileHashes.lock b/代码解读/MiNotes-master/.gradle/6.5/fileHashes/fileHashes.lock index 25eb5d0..fecc8dd 100644 Binary files a/代码解读/MiNotes-master/.gradle/6.5/fileHashes/fileHashes.lock and b/代码解读/MiNotes-master/.gradle/6.5/fileHashes/fileHashes.lock differ diff --git a/代码解读/MiNotes-master/.gradle/6.5/fileHashes/resourceHashesCache.bin b/代码解读/MiNotes-master/.gradle/6.5/fileHashes/resourceHashesCache.bin index a4fbdfc..c6812a8 100644 Binary files a/代码解读/MiNotes-master/.gradle/6.5/fileHashes/resourceHashesCache.bin and b/代码解读/MiNotes-master/.gradle/6.5/fileHashes/resourceHashesCache.bin differ diff --git a/代码解读/MiNotes-master/.gradle/6.5/javaCompile/classAnalysis.bin b/代码解读/MiNotes-master/.gradle/6.5/javaCompile/classAnalysis.bin index ae2c9d9..184b2a1 100644 Binary files a/代码解读/MiNotes-master/.gradle/6.5/javaCompile/classAnalysis.bin and b/代码解读/MiNotes-master/.gradle/6.5/javaCompile/classAnalysis.bin differ diff --git a/代码解读/MiNotes-master/.gradle/6.5/javaCompile/javaCompile.lock b/代码解读/MiNotes-master/.gradle/6.5/javaCompile/javaCompile.lock index 17818d7..e234e35 100644 Binary files a/代码解读/MiNotes-master/.gradle/6.5/javaCompile/javaCompile.lock and b/代码解读/MiNotes-master/.gradle/6.5/javaCompile/javaCompile.lock differ diff --git a/代码解读/MiNotes-master/.gradle/6.5/javaCompile/taskHistory.bin b/代码解读/MiNotes-master/.gradle/6.5/javaCompile/taskHistory.bin index dc8d41c..b0cf083 100644 Binary files a/代码解读/MiNotes-master/.gradle/6.5/javaCompile/taskHistory.bin and b/代码解读/MiNotes-master/.gradle/6.5/javaCompile/taskHistory.bin differ diff --git a/代码解读/MiNotes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/代码解读/MiNotes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 74b2036..338b2e7 100644 Binary files a/代码解读/MiNotes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/代码解读/MiNotes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/代码解读/MiNotes-master/.gradle/buildOutputCleanup/outputFiles.bin b/代码解读/MiNotes-master/.gradle/buildOutputCleanup/outputFiles.bin index c55a00b..d0dd212 100644 Binary files a/代码解读/MiNotes-master/.gradle/buildOutputCleanup/outputFiles.bin and b/代码解读/MiNotes-master/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/代码解读/MiNotes-master/.gradle/checksums/checksums.lock b/代码解读/MiNotes-master/.gradle/checksums/checksums.lock index a88b298..ed59705 100644 Binary files a/代码解读/MiNotes-master/.gradle/checksums/checksums.lock and b/代码解读/MiNotes-master/.gradle/checksums/checksums.lock differ diff --git a/代码解读/MiNotes-master/.gradle/checksums/md5-checksums.bin b/代码解读/MiNotes-master/.gradle/checksums/md5-checksums.bin index d5419c0..bde16cc 100644 Binary files a/代码解读/MiNotes-master/.gradle/checksums/md5-checksums.bin and b/代码解读/MiNotes-master/.gradle/checksums/md5-checksums.bin differ diff --git a/代码解读/MiNotes-master/.gradle/checksums/sha1-checksums.bin b/代码解读/MiNotes-master/.gradle/checksums/sha1-checksums.bin index ab87b59..9cbedc4 100644 Binary files a/代码解读/MiNotes-master/.gradle/checksums/sha1-checksums.bin and b/代码解读/MiNotes-master/.gradle/checksums/sha1-checksums.bin differ diff --git a/代码解读/MiNotes-master/.idea/.gitignore b/代码解读/MiNotes-master/.idea/.gitignore index 359bb53..26d3352 100644 --- a/代码解读/MiNotes-master/.idea/.gitignore +++ b/代码解读/MiNotes-master/.idea/.gitignore @@ -1,3 +1,3 @@ -# 默认忽略的文件 +# Default ignored files /shelf/ /workspace.xml diff --git a/代码解读/MiNotes-master/app/.idea/.gitignore b/代码解读/MiNotes-master/app/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/代码解读/MiNotes-master/app/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/代码解读/MiNotes-master/app/.idea/gradle.xml b/代码解读/MiNotes-master/app/.idea/gradle.xml deleted file mode 100644 index f22a539..0000000 --- a/代码解读/MiNotes-master/app/.idea/gradle.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/代码解读/MiNotes-master/app/.idea/misc.xml b/代码解读/MiNotes-master/app/.idea/misc.xml deleted file mode 100644 index 6ff4d26..0000000 --- a/代码解读/MiNotes-master/app/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/代码解读/MiNotes-master/app/build.gradle b/代码解读/MiNotes-master/app/build.gradle index ab3b62f..77ea776 100644 --- a/代码解读/MiNotes-master/app/build.gradle +++ b/代码解读/MiNotes-master/app/build.gradle @@ -1,15 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 + compileSdkVersion 23 buildToolsVersion "25.0.1" - aaptOptions.cruncherEnabled = false - aaptOptions.useNewCruncher = false - + useLibrary 'org.apache.http.legacy' defaultConfig { applicationId "net.micode.notes" minSdkVersion 14 - targetSdkVersion 33 + targetSdkVersion 14 } buildTypes { @@ -18,5 +16,5 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - android{ useLibrary 'org.apache.http.legacy' } +// android{ useLibrary 'org.apache.http.legacy' } } diff --git a/代码解读/MiNotes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/代码解读/MiNotes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 8434f7d..c6aa9d7 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/代码解读/MiNotes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/代码解读/MiNotes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 9ce76ea..1123178 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/代码解读/MiNotes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index aa19539..e8213f0 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,6 +1,2 @@ -<<<<<<< remotes/origin/c_master - -======= - ->>>>>>> local + \ No newline at end of file diff --git a/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 059460a..e13f131 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,6 +1,2 @@ -<<<<<<< remotes/origin/c_master - -======= - ->>>>>>> local + \ No newline at end of file diff --git a/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index d59a512..50021f7 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,199 +1,98 @@ -<<<<<<< remotes/origin/c_master -#Tue Mar 07 22:11:18 CST 2023 -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more_dark.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more_dark.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\raw\\introduction=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat -D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat -======= -#Wed Mar 15 08:45:45 CST 2023 -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_item.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\widget_2x.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\add_account_text.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more_dark.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more_dark.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\widget_4x.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\menu\\sub_folder.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\raw\\introduction=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_edit.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\layout\\settings_header.xml=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat -E\:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat ->>>>>>> local +#Wed Mar 15 19:23:06 CST 2023 +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\raw-zh-rCN\\introduction=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\widget_4x.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\account_dialog_title.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\add_account_text.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\widget_2x.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\sub_folder.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\datetime_picker.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_edit.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more_dark.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more_dark.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_list.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_item.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\delete.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\raw\\introduction=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\settings_header.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat +E\:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat diff --git a/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 529f0b8..17e79b5 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,9 +1,5 @@ -<<<<<<< remotes/origin/c_master - -======= - ->>>>>>> local + -%s --%s --%s @@ -11,19 +7,11 @@ Messaging Email -<<<<<<< remotes/origin/c_master - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - - 短信 - 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 - %1$s 条符合“%2$s”的搜索结果 - - 短信 - 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - -======= - + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - + 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - ->>>>>>> local + \ No newline at end of file diff --git a/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index c1c1ee9..1175a7f 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/代码解读/MiNotes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,6 +1,2 @@ -<<<<<<< remotes/origin/c_master - -======= - ->>>>>>> local + \ No newline at end of file diff --git a/代码解读/MiNotes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/代码解读/MiNotes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 5789ebd..86235c2 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/代码解读/MiNotes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,9 +1,4 @@ -<<<<<<< remotes/origin/c_master -#Tue Mar 14 21:23:28 CST 2023 -base.0=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex -======= -#Wed Mar 15 08:45:50 CST 2023 -base.0=E\:\\MiNotes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex ->>>>>>> local +#Fri Apr 14 19:30:33 CST 2023 +base.0=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/代码解读/MiNotes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/代码解读/MiNotes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index f90bb4a..ac3429c 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/代码解读/MiNotes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class index 7aa39fb..9bae926 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index 5312fbd..9495df8 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 0ff5205..21bc337 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class index db4da28..5cd4f92 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class index c2f45a7..5080bb7 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class index 0ce0c21..143323d 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index 0fea81b..b93e23c 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index da365c7..fa733c0 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class index 6094405..48a23d8 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/代码解读/MiNotes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/代码解读/MiNotes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 3888d92..0b4e688 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/代码解读/MiNotes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,505 +20,254 @@ 20 android:versionName="0.1" > 21 22 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 +22-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:24:5-25:42 23 android:minSdkVersion="14" -23-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:24:15-41 +23-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:24:15-41 24 android:targetSdkVersion="14" /> -24-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 +24-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:24:5-25:42 25 26 -26-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:27:5-81 -26-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:27:22-78 +26-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:27:5-81 +26-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:27:22-78 27 -27-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:28:5-88 -27-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:28:22-85 +27-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:28:5-88 +27-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:28:22-85 28 -28-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:29:5-67 -28-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:29:22-64 +28-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:29:5-67 +28-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:29:22-64 29 -29-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:30:5-72 -29-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:30:22-69 +29-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:30:5-72 +29-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:30:22-69 30 -30-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:31:5-74 -30-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:31:22-71 +30-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:31:5-74 +30-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:31:22-71 31 -31-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:32:5-80 -31-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:32:22-77 +31-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:32:5-80 +31-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:32:22-77 32 -32-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:33:5-71 -32-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:33:22-68 +32-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:33:5-71 +32-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:33:22-68 33 -33-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:34:5-74 -33-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:34:22-71 +33-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:34:5-74 +33-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:34:22-71 34 -34-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:35:5-81 -34-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:35:22-78 +34-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:35:5-81 +34-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:35:22-78 35 36 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:37:5-151:19 +36-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:37:5-151:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:38:9-42 +38-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:38:9-42 39 android:label="@string/app_name" -39-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:39:9-41 +39-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:39:9-41 40 android:testOnly="true" > 41 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:40:9-53:20 +41-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:40:9-53:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:41:13-49 +42-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:41:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:42:13-74 +43-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:42:13-74 44 android:label="@string/app_name" -44-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:43:13-45 +44-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:43:13-45 45 android:launchMode="singleTop" -45-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:44:13-43 +45-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:44:13-43 46 android:theme="@style/NoteTheme" -46-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:45:13-45 +46-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:45:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:46:13-57 +47-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:46:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:47:13-52 +48-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:47:13-52 49 -49-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:49:13-52:29 +49-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:49:13-52:29 50 -50-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:50:17-69 -50-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:50:25-66 +50-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:50:17-69 +50-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:50:25-66 51 52 -52-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:51:17-77 -52-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:51:27-74 +52-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:51:17-77 +52-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:51:27-74 53 54 55 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:55:9-83:20 +55-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:55:9-83:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:56:13-48 +56-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:56:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:57:13-74 +57-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:57:13-74 58 android:launchMode="singleTop" -58-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:58:13-43 +58-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:58:13-43 59 android:theme="@style/NoteTheme" > -59-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:59:13-45 +59-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:59:13-45 60 -60-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:61:13-66:29 +60-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:61:13-66:29 61 -61-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:62:17-69 -61-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:62:25-66 +61-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:62:17-69 +61-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:62:25-66 62 63 -63-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:63:17-76 -63-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:63:27-73 +63-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:63:17-76 +63-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:63:27-73 64 65 -65-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:64:17-78 -65-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:64:23-75 +65-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:64:17-78 +65-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:64:23-75 66 -66-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:64:17-78 -66-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:64:23-75 +66-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:64:17-78 +66-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:64:23-75 67 68 -68-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:68:13-73:29 +68-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:68:13-73:29 69 -69-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:69:17-79 -69-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:69:25-76 +69-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:69:17-79 +69-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:69:25-76 70 71 -71-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:63:17-76 -71-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:63:27-73 +71-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:63:17-76 +71-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:63:27-73 72 73 -73-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:64:17-78 -73-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:64:23-75 +73-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:64:17-78 +73-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:64:23-75 74 -74-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:64:17-78 -74-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:64:23-75 +74-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:64:17-78 +74-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:64:23-75 75 76 -76-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:75:13-78:29 +76-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:75:13-78:29 77 -77-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:76:17-71 -77-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:76:25-68 +77-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:76:17-71 +77-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:76:25-68 78 79 -79-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:63:17-76 -79-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:63:27-73 +79-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:63:17-76 +79-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:63:27-73 80 81 82 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:80:13-82:54 +82-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:80:13-82:54 83 android:name="android.app.searchable" -83-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:81:17-54 +83-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:81:17-54 84 android:resource="@xml/searchable" /> -84-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:82:17-51 +84-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:82:17-51 85 86 87 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:85:9-88:43 +87-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:85:9-88:43 88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:86:13-63 +88-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:86:13-63 89 android:authorities="micode_notes" -89-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:87:13-47 +89-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:87:13-47 90 android:multiprocess="true" /> -90-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:88:13-40 +90-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:88:13-40 91 92 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:90:9-102:20 +92-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:90:9-102:20 93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:91:13-57 +93-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:91:13-57 94 android:label="@string/app_widget2x2" > -94-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:92:13-50 +94-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:92:13-50 95 -95-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:93:13-97:29 +95-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:93:13-97:29 96 -96-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:94:17-84 -96-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:94:25-81 +96-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:94:17-84 +96-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:94:25-81 97 -97-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:95:17-85 -97-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:95:25-82 +97-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:95:17-85 +97-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:95:25-82 98 -98-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:96:17-85 -98-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:96:25-82 +98-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:96:17-85 +98-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:96:25-82 99 100 101 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:99:13-101:58 +101-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:99:13-101:58 102 android:name="android.appwidget.provider" -102-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:100:17-58 +102-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:100:17-58 103 android:resource="@xml/widget_2x_info" /> -103-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:101:17-55 +103-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:101:17-55 104 105 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:103:9-116:20 +105-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:103:9-116:20 106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:104:13-57 +106-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:104:13-57 107 android:label="@string/app_widget4x4" > -107-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:105:13-50 +107-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:105:13-50 108 -108-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:93:13-97:29 +108-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:93:13-97:29 109 -109-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:94:17-84 -109-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:94:25-81 +109-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:94:17-84 +109-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:94:25-81 110 -110-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:95:17-85 -110-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:95:25-82 +110-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:95:17-85 +110-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:95:25-82 111 -111-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:96:17-85 -111-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:96:25-82 +111-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:96:17-85 +111-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:96:25-82 112 113 114 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:99:13-101:58 +114-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:99:13-101:58 115 android:name="android.appwidget.provider" -115-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:100:17-58 +115-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:100:17-58 116 android:resource="@xml/widget_4x_info" /> -116-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:101:17-55 +116-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:101:17-55 117 118 -118-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:118:9-122:20 -118-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:118:19-55 +118-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:118:9-122:20 +118-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:118:19-55 119 -119-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:119:13-121:29 +119-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:119:13-121:29 120 -120-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:120:17-79 -120-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:120:25-76 +120-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:120:17-79 +120-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:120:25-76 121 122 123 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:124:9-127:20 +123-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:124:9-127:20 124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:125:13-61 +124-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:125:13-61 125 android:process=":remote" > -125-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:126:13-38 +125-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:126:13-38 126 127 128 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:129:9-134:20 +128-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:129:9-134:20 129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:130:13-50 +129-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:130:13-50 130 android:label="@string/app_name" -130-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:131:13-45 +130-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:131:13-45 131 android:launchMode="singleInstance" -131-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:132:13-48 +131-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:132:13-48 132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:133:13-75 +132-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:133:13-75 133 134 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:136:9-141:20 +134-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:136:9-141:20 135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:137:13-71 +135-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:137:13-71 136 android:label="@string/preferences_title" -136-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:138:13-54 +136-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:138:13-54 137 android:launchMode="singleTop" -137-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:139:13-43 +137-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:139:13-43 138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:140:13-60 +138-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:140:13-60 139 140 141 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:143:9-146:19 +141-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:143:9-146:19 142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:144:13-74 +142-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:144:13-74 143 android:exported="false" > -143-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:145:13-37 +143-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:145:13-37 144 145 146 D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:148:9-150:52 +146-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:148:9-150:52 147 android:name="android.app.default_searchable" -147-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:149:13-58 +147-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:149:13-58 148 android:value=".ui.NoteEditActivity" /> -148-->D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:150:13-49 -======= -22-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 -23 android:minSdkVersion="14" -23-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:24:15-41 -24 android:targetSdkVersion="33" /> -24-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 -25 -26 -26-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:27:5-81 -26-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:27:22-78 -27 -27-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:28:5-88 -27-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:28:22-85 -28 -28-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:29:5-67 -28-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:29:22-64 -29 -29-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:30:5-72 -29-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:30:22-69 -30 -30-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:31:5-74 -30-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:31:22-71 -31 -31-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:32:5-80 -31-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:32:22-77 -32 -32-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:33:5-71 -32-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:33:22-68 -33 -33-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:34:5-74 -33-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:34:22-71 -34 -34-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:35:5-81 -34-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:35:22-78 -35 -36 E:\MiNotes-master\app\src\main\AndroidManifest.xml:37:5-151:19 -37 android:debuggable="true" -38 android:icon="@drawable/icon_app" -38-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:38:9-42 -39 android:label="@string/app_name" -39-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:39:9-41 -40 android:testOnly="true" > -41 E:\MiNotes-master\app\src\main\AndroidManifest.xml:40:9-53:20 -42 android:name="net.micode.notes.ui.NotesListActivity" -42-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:41:13-49 -43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:42:13-74 -44 android:label="@string/app_name" -44-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:43:13-45 -45 android:launchMode="singleTop" -45-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:44:13-43 -46 android:theme="@style/NoteTheme" -46-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:45:13-45 -47 android:uiOptions="splitActionBarWhenNarrow" -47-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:46:13-57 -48 android:windowSoftInputMode="adjustPan" > -48-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:47:13-52 -49 -49-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:49:13-52:29 -50 -50-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:50:17-69 -50-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:50:25-66 -51 -52 -52-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:51:17-77 -52-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:51:27-74 -53 -54 -55 E:\MiNotes-master\app\src\main\AndroidManifest.xml:55:9-83:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:56:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:57:13-74 -58 android:launchMode="singleTop" -58-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:58:13-43 -59 android:theme="@style/NoteTheme" > -59-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:59:13-45 -60 -60-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:61:13-66:29 -61 -61-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:62:17-69 -61-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:62:25-66 -62 -63 -63-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:63:17-76 -63-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:63:27-73 -64 -65 -65-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:64:17-78 -65-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:64:23-75 -66 -66-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:64:17-78 -66-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:64:23-75 -67 -68 -68-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:68:13-73:29 -69 -69-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:69:17-79 -69-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:69:25-76 -70 -71 -71-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:63:17-76 -71-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:63:27-73 -72 -73 -73-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:64:17-78 -73-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:64:23-75 -74 -74-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:64:17-78 -74-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:64:23-75 -75 -76 -76-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:75:13-78:29 -77 -77-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:76:17-71 -77-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:76:25-68 -78 -79 -79-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:63:17-76 -79-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:63:27-73 -80 -81 -82 E:\MiNotes-master\app\src\main\AndroidManifest.xml:80:13-82:54 -83 android:name="android.app.searchable" -83-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:81:17-54 -84 android:resource="@xml/searchable" /> -84-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:82:17-51 -85 -86 -87 E:\MiNotes-master\app\src\main\AndroidManifest.xml:85:9-88:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:86:13-63 -89 android:authorities="micode_notes" -89-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:87:13-47 -90 android:multiprocess="true" /> -90-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:88:13-40 -91 -92 E:\MiNotes-master\app\src\main\AndroidManifest.xml:90:9-102:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:91:13-57 -94 android:label="@string/app_widget2x2" > -94-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:92:13-50 -95 -95-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:93:13-97:29 -96 -96-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:94:17-84 -96-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:94:25-81 -97 -97-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:95:17-85 -97-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:95:25-82 -98 -98-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:96:17-85 -98-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:96:25-82 -99 -100 -101 E:\MiNotes-master\app\src\main\AndroidManifest.xml:99:13-101:58 -102 android:name="android.appwidget.provider" -102-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:100:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:101:17-55 -104 -105 E:\MiNotes-master\app\src\main\AndroidManifest.xml:103:9-116:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:104:13-57 -107 android:label="@string/app_widget4x4" > -107-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:105:13-50 -108 -108-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:93:13-97:29 -109 -109-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:94:17-84 -109-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:94:25-81 -110 -110-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:95:17-85 -110-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:95:25-82 -111 -111-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:96:17-85 -111-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:96:25-82 -112 -113 -114 E:\MiNotes-master\app\src\main\AndroidManifest.xml:99:13-101:58 -115 android:name="android.appwidget.provider" -115-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:100:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:101:17-55 -117 -118 -118-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:118:9-122:20 -118-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:118:19-55 -119 -119-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:119:13-121:29 -120 -120-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:120:17-79 -120-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:120:25-76 -121 -122 -123 E:\MiNotes-master\app\src\main\AndroidManifest.xml:124:9-127:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:125:13-61 -125 android:process=":remote" > -125-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:126:13-38 -126 -127 -128 E:\MiNotes-master\app\src\main\AndroidManifest.xml:129:9-134:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:130:13-50 -130 android:label="@string/app_name" -130-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:131:13-45 -131 android:launchMode="singleInstance" -131-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:132:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:133:13-75 -133 -134 E:\MiNotes-master\app\src\main\AndroidManifest.xml:136:9-141:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:137:13-71 -136 android:label="@string/preferences_title" -136-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:138:13-54 -137 android:launchMode="singleTop" -137-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:139:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:140:13-60 -139 -140 -141 E:\MiNotes-master\app\src\main\AndroidManifest.xml:143:9-146:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:144:13-74 -143 android:exported="false" > -143-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:145:13-37 -144 -145 -146 E:\MiNotes-master\app\src\main\AndroidManifest.xml:148:9-150:52 -147 android:name="android.app.default_searchable" -147-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:149:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->E:\MiNotes-master\app\src\main\AndroidManifest.xml:150:13-49 ->>>>>>> local +148-->E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:150:13-49 149 150 151 diff --git a/代码解读/MiNotes-master/app/build/intermediates/merged_manifest/debug/out/AndroidManifest.xml b/代码解读/MiNotes-master/app/build/intermediates/merged_manifest/debug/out/AndroidManifest.xml index c6c7647..f237bf5 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/merged_manifest/debug/out/AndroidManifest.xml +++ b/代码解读/MiNotes-master/app/build/intermediates/merged_manifest/debug/out/AndroidManifest.xml @@ -21,7 +21,7 @@ + android:targetSdkVersion="14" /> diff --git a/代码解读/MiNotes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/代码解读/MiNotes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index c6c7647..f237bf5 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/代码解读/MiNotes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -21,7 +21,7 @@ + android:targetSdkVersion="14" /> diff --git a/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index c696b84..572b34f 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,40 +1,10 @@ { "logs": [ { -<<<<<<< remotes/origin/c_master - "outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", -======= - "outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", ->>>>>>> local - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { -<<<<<<< remotes/origin/c_master - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", -======= - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", ->>>>>>> local + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -51,15 +21,9 @@ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } - } - ] - }, - { -<<<<<<< remotes/origin/c_master - "outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ + }, { - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -76,73 +40,14 @@ "endColumns": "19", "endOffsets": "210" } - }, - { - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "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", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "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", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } } ] }, { - "outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat", - "map": [ - { - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "589,641,694,747,799", - "endColumns": "51,52,52,51,51", - "endOffsets": "636,689,742,794,846" - } - }, - { - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "532", - "endColumns": "56", - "endOffsets": "584" - } - }, - { - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\strings.xml", -======= - "outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat", + "outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat", "map": [ { - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\strings.xml", ->>>>>>> local + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\strings.xml", "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -161,10 +66,7 @@ } }, { -<<<<<<< remotes/origin/c_master - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\styles.xml", -======= - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -181,27 +83,7 @@ } }, { - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,412", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "407,527" - } - }, - { - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\styles.xml", ->>>>>>> local + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\styles.xml", "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", @@ -220,11 +102,26 @@ } }, { -<<<<<<< remotes/origin/c_master - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\arrays.xml", -======= - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\dimens.xml", ->>>>>>> local + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,412", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "407,527" + } + }, + { + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -241,14 +138,12 @@ } } ] -<<<<<<< remotes/origin/c_master -======= }, { - "outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -267,7 +162,7 @@ } }, { - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -286,7 +181,6 @@ } } ] ->>>>>>> local } ] } \ No newline at end of file diff --git a/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index d94a081..0aef65d 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -1,17 +1,29 @@ { "logs": [ { -<<<<<<< remotes/origin/c_master - "outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", + "outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", "map": [ { - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", -======= - "outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", - "map": [ + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "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", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "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", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } + }, { - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", ->>>>>>> local + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -28,29 +40,6 @@ "endColumns": "19", "endOffsets": "210" } - }, - { -<<<<<<< remotes/origin/c_master - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", -======= - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", ->>>>>>> local - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "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", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "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", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } } ] } diff --git a/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index ef9b830..83e9dac 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -1,17 +1,10 @@ { "logs": [ { -<<<<<<< remotes/origin/c_master - "outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", + "outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", "map": [ { - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", -======= - "outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", - "map": [ - { - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", ->>>>>>> local + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -30,11 +23,7 @@ } }, { -<<<<<<< remotes/origin/c_master - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", -======= - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", ->>>>>>> local + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 237cf20..855f065 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,51 +1,10 @@ { "logs": [ { -<<<<<<< remotes/origin/c_master - "outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", + "outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", "map": [ { - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "589,641,694,747,799", - "endColumns": "51,52,52,51,51", - "endOffsets": "636,689,742,794,846" - } - }, - { - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "532", - "endColumns": "56", - "endOffsets": "584" - } - }, - { - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\strings.xml", -======= - "outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", - "map": [ - { - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\strings.xml", ->>>>>>> local + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\strings.xml", "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -64,10 +23,7 @@ } }, { -<<<<<<< remotes/origin/c_master - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\styles.xml", -======= - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -84,27 +40,7 @@ } }, { - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,412", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "407,527" - } - }, - { - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\styles.xml", ->>>>>>> local + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\styles.xml", "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", @@ -123,11 +59,26 @@ } }, { -<<<<<<< remotes/origin/c_master - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\arrays.xml", -======= - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\dimens.xml", ->>>>>>> local + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,412", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "407,527" + } + }, + { + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", diff --git a/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index ddf4f56..8d15651 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/代码解读/MiNotes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,779 +1,390 @@ [ { -<<<<<<< remotes/origin/c_master - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\sub_folder.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\widget_2x.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_item.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\add_account_text.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable\\new_note.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\call_record_folder.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_edit.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\xml\\preferences.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\datetime_picker.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\notification.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\xml\\widget_2x_info.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\add_account_text.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\raw\\introduction" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\settings_header.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more_dark.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more_dark.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\xml\\searchable.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\widget_4x.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\widget_4x.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\raw\\introduction" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\xml\\widget_4x_info.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\account_dialog_title.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\note_list_options.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\widget_2x.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\xml\\preferences.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\call_note_edit.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\note_edit.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_edit.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\sub_folder.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\color\\primary_text_dark.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_list.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\note_edit.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\delete.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\menu\\note_list.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\settings_header.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable\\new_note.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more_dark.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more_dark.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\xml\\searchable.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\raw-zh-rCN\\introduction" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\clock.png" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list_options.xml" + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\layout\\note_item.xml" }, { - "merged": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat", - "source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml" -======= - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\settings_header.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable\\new_note.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\menu\\sub_folder.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\add_account_text.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\raw\\introduction" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\widget_4x.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more_dark.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more_dark.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\menu\\note_edit.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\widget_2x.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_item.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\menu\\note_list_options.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_edit.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\xml\\preferences.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_ic_menu_more.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_more.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\layout\\note_list.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\xml\\searchable.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png" - }, - { - "merged": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "E:\\MiNotes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" ->>>>>>> local + "merged": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", + "source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" } ] \ No newline at end of file diff --git a/代码解读/MiNotes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/代码解读/MiNotes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index c6c7647..f237bf5 100644 --- a/代码解读/MiNotes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/代码解读/MiNotes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -21,7 +21,7 @@ + android:targetSdkVersion="14" /> diff --git a/代码解读/MiNotes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/代码解读/MiNotes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 7b3600c..8e2f5d7 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/代码解读/MiNotes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex index c2f6ff2..80d2356 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index 458e9a7..6044a03 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index 07caa1c..2b7cabe 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex index cd35ed1..14ac410 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex index fe5bcda..5188fc5 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex index d5446e8..db6fd6f 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 13087ed..bdf5105 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index b96217d..3975bce 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex index a052f18..ee5a7df 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/代码解读/MiNotes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat index 9eb0fa1..a3e93ad 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat index 7014292..b1f0e4f 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat index 7bec5bc..2508059 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat index a6660ba..1d99345 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat index e021525..4fca941 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat index 1478550..adb8969 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat index 77a838e..ddaabbd 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat index ec318dd..276da20 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat index af1d041..edb2c06 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat index c5cb811..d99cd04 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat index 5daf563..b3ef160 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat index d6d29e5..460359e 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat index 578e87d..178784c 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat index 7afec2d..9ce855f 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat index c7b5d2c..ee083b2 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat index fbe32b4..3a7bd63 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat index 1339c20..e675f12 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat index 9bd50f4..94b1191 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat index e7700ff..a94520d 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat index 5726683..8355066 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat index e5d80c7..3a74f5d 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat index 76dcf8d..ad28def 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat index 3f9fd50..eed9671 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_ic_menu_more.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_ic_menu_more.png.flat index ba25572..3d9634d 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_ic_menu_more.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_ic_menu_more.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_ic_menu_more_dark.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_ic_menu_more_dark.png.flat index d27e386..9b48b64 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_ic_menu_more_dark.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_ic_menu_more_dark.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat index 4fe5d84..f5ef668 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat index 812880c..9c5ad3e 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat index 7317b29..29d04a3 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat index 1746d37..1c1cdf6 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat index 2c94f59..67d23b9 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat index e4c4e28..d6d8d63 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat index 3eed6d8..390488f 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat index d01d9bb..6b5e9c3 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat index 9a8aaab..b766551 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat index e3e142e..385c87f 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat index afc6373..7ec798c 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat index 036ff30..6f3d094 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat index e6fb3be..f1ddf79 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat index 531836c..4691b63 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat index 394f54b..211ca29 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat index 8a2f28f..79890fc 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat index 0b20d8f..84a46b4 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat index 1f1cb1e..efcf1ce 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat index d568dd3..7dd4e5c 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat index 310c4e5..70362eb 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat index 10d2bb2..1489837 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat index 06344e8..d2fdc25 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat index 1a11046..a5baabe 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat index 0164b8c..9f00ab3 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat index eb51d36..ad0094a 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat index ef81ba6..e60d3e1 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat index fddd0da..d72267e 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat index c3a3f6f..04e264c 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat index 204a27b..3a15803 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat index d476f4d..fb5a180 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat index 0a61401..32cd9f2 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat index d2d0d89..f93eafa 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat index 571ad12..6899cae 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat index 4b8d1aa..db3c936 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat index 69857e4..cd4efbf 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat index c31a8ed..7a91da1 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat index 8935881..788d940 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat index c5365f8..01b4339 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat index 80ed644..49deddd 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat index 9e44efc..f421811 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat index 335117b..3003732 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat index 127af1b..35fc628 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat index 8b42e8a..cec679a 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat index a8075de..58bf5f9 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat index 4d8feed..e37951a 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat index c0a5054..7166569 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat index 7e0b906..3ae97d6 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat index bfb1c6b..8c54e1a 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat index 27df4af..0e06cc1 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat index f985ac2..70ce7f2 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat index 6b08dfa..05a71a0 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat index 0edaca6..482e5af 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat index 6a92cc4..6c30b2a 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat index 736d0c5..30ad55a 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat index 28e3158..848772b 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat index 15e0a02..dae7dc5 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat index cceec74..4471b73 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat index b46ef7d..7a01901 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat index 805886a..6de7e3b 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat index 263a8c6..121c1b8 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat index f07123d..85991ce 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat index 4530a1e..6cfb2d3 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat index 29bdc7b..fa294bf 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat index 0f3d263..91e0584 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat index 4625ebf..ae9b8a3 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat index 87c112d..e6e1717 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat index 079f154..0ff5d08 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/raw_introduction.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/raw_introduction.flat index c162fc6..38f6090 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/raw_introduction.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/raw_introduction.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 2e7767a..c70ad01 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat index e6f23c5..346e70a 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat index 49931c8..40c95eb 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat index ca995d4..364eece 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat index 9bc0d71..288ab5c 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat index e1978f2..c5093ad 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat index 898e95c..6bfdfb6 100644 Binary files a/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat and b/代码解读/MiNotes-master/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat differ diff --git a/代码解读/MiNotes-master/app/build/outputs/apk/debug/app-debug.apk b/代码解读/MiNotes-master/app/build/outputs/apk/debug/app-debug.apk index e9940be..f20e995 100644 Binary files a/代码解读/MiNotes-master/app/build/outputs/apk/debug/app-debug.apk and b/代码解读/MiNotes-master/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/代码解读/MiNotes-master/app/build/outputs/logs/manifest-merger-debug-report.txt b/代码解读/MiNotes-master/app/build/outputs/logs/manifest-merger-debug-report.txt index 8a5b886..983f911 100644 --- a/代码解读/MiNotes-master/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/代码解读/MiNotes-master/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,479 +1,239 @@ -- Merging decision tree log --- manifest -<<<<<<< remotes/origin/c_master -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 package - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:20:5-31 - INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml - INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:20:5-31 + INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml + INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:22:5-30 - INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml - INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:22:5-30 + INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml + INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml xmlns:tools - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:19:5-51 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:19:5-51 xmlns:android - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:21:5-28 - INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml - INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:21:5-28 + INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml + INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:24:5-25:42 android:targetSdkVersion - INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 - INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml + INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:24:5-25:42 + INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml tools:ignore - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:25:9-39 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:25:9-39 android:minSdkVersion - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:24:15-41 - INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml - INJECTED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:24:15-41 + INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml + INJECTED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:27:5-81 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:27:5-81 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:27:22-78 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:27:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:28:5-88 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:28:5-88 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:28:22-85 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:28:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:29:5-67 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:29:5-67 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:29:22-64 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:29:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:30:5-72 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:30:5-72 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:30:22-69 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:30:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:31:5-74 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:31:5-74 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:31:22-71 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:31:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:32:5-80 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:32:5-80 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:32:22-77 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:32:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:33:5-71 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:33:5-71 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:33:22-68 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:33:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:34:5-74 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:34:5-74 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:34:22-71 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:34:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:35:5-81 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:35:5-81 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:35:22-78 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:35:22-78 application -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:37:5-151:19 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:37:5-151:19 android:label - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:39:9-41 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:39:9-41 android:icon - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:38:9-42 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:38:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:40:9-53:20 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:40:9-53:20 android:label - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:43:13-45 android:launchMode - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:44:13-43 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:44:13-43 android:windowSoftInputMode - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:47:13-52 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:47:13-52 android:uiOptions - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:46:13-57 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:46:13-57 android:configChanges - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:42:13-74 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:42:13-74 android:theme - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:45:13-45 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:45:13-45 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:41:13-49 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:41:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:49:13-52:29 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:49:13-52:29 action#android.intent.action.MAIN -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:50:17-69 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:50:17-69 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:50:25-66 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:50:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:51:17-77 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:51:17-77 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:51:27-74 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:51:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:55:9-83:20 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:55:9-83:20 android:launchMode - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:58:13-43 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:58:13-43 android:configChanges - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:57:13-74 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:57:13-74 android:theme - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:59:13-45 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:59:13-45 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:56:13-48 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:56:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:61:13-66:29 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:61:13-66:29 action#android.intent.action.VIEW -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:62:17-69 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:62:17-69 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:62:25-66 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:62:25-66 category#android.intent.category.DEFAULT -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:63:17-76 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:63:17-76 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:63:27-73 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:63:27-73 data -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:64:17-78 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:64:17-78 android:mimeType - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:64:23-75 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:64:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:68:13-73:29 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:68:13-73:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:69:17-79 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:69:17-79 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:69:25-76 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:69:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:75:13-78:29 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:75:13-78:29 action#android.intent.action.SEARCH -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:76:17-71 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:76:17-71 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:76:25-68 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:76:25-68 meta-data#android.app.searchable -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:80:13-82:54 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:80:13-82:54 android:resource - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:82:17-51 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:82:17-51 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:81:17-54 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:81:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:85:9-88:43 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:85:9-88:43 android:authorities - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:87:13-47 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:87:13-47 android:multiprocess - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:88:13-40 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:88:13-40 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:86:13-63 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:86:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:90:9-102:20 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:90:9-102:20 android:label - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:92:13-50 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:92:13-50 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:91:13-57 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:91:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:93:13-97:29 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:93:13-97:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:94:17-84 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:94:17-84 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:94:25-81 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:94:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:95:17-85 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:95:17-85 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:95:25-82 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:95:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:96:17-85 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:96:17-85 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:96:25-82 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:96:25-82 meta-data#android.appwidget.provider -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:99:13-101:58 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:99:13-101:58 android:resource - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:101:17-55 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:101:17-55 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:100:17-58 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:100:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:103:9-116:20 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:103:9-116:20 android:label - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:105:13-50 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:105:13-50 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:104:13-57 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:104:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:118:9-122:20 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:118:9-122:20 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:118:19-55 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:118:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:119:13-121:29 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:119:13-121:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:120:17-79 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:120:17-79 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:120:25-76 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:120:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:124:9-127:20 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:124:9-127:20 android:process - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:126:13-38 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:126:13-38 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:125:13-61 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:125:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:129:9-134:20 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:129:9-134:20 android:label - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:131:13-45 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:131:13-45 android:launchMode - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:132:13-48 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:132:13-48 android:theme - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:133:13-75 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:133:13-75 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:130:13-50 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:130:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:136:9-141:20 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:136:9-141:20 android:label - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:138:13-54 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:138:13-54 android:launchMode - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:139:13-43 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:139:13-43 android:theme - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:140:13-60 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:140:13-60 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:137:13-71 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:137:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:143:9-146:19 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:143:9-146:19 android:exported - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:145:13-37 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:145:13-37 android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:144:13-74 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:144:13-74 meta-data#android.app.default_searchable -ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:148:9-150:52 +ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:148:9-150:52 android:value - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:150:13-49 - android:name - ADDED from D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\AndroidManifest.xml:149:13-58 -======= -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:18:1-152:12 - package - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:20:5-31 - INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml - INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml - android:versionName - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:22:5-30 - INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml - INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml - xmlns:tools - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:19:5-51 - xmlns:android - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:18:11-69 - android:versionCode - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:21:5-28 - INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml - INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml -uses-sdk -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 - android:targetSdkVersion - INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:24:5-25:42 - INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml - tools:ignore - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:25:9-39 - android:minSdkVersion - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:24:15-41 - INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml - INJECTED from E:\MiNotes-master\app\src\main\AndroidManifest.xml -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:27:5-81 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:27:22-78 -uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:28:5-88 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:28:22-85 -uses-permission#android.permission.INTERNET -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:29:5-67 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:29:22-64 -uses-permission#android.permission.READ_CONTACTS -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:30:5-72 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:30:22-69 -uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:31:5-74 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:31:22-71 -uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:32:5-80 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:32:22-77 -uses-permission#android.permission.GET_ACCOUNTS -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:33:5-71 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:33:22-68 -uses-permission#android.permission.USE_CREDENTIALS -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:34:5-74 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:34:22-71 -uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:35:5-81 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:35:22-78 -application -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:37:5-151:19 - android:label - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:39:9-41 - android:icon - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:38:9-42 -activity#net.micode.notes.ui.NotesListActivity -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:40:9-53:20 - android:label - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:43:13-45 - android:launchMode - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:44:13-43 - android:windowSoftInputMode - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:47:13-52 - android:uiOptions - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:46:13-57 - android:configChanges - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:42:13-74 - android:theme - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:45:13-45 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:41:13-49 -intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:49:13-52:29 -action#android.intent.action.MAIN -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:50:17-69 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:50:25-66 -category#android.intent.category.LAUNCHER -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:51:17-77 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:51:27-74 -activity#net.micode.notes.ui.NoteEditActivity -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:55:9-83:20 - android:launchMode - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:58:13-43 - android:configChanges - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:57:13-74 - android:theme - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:59:13-45 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:56:13-48 -intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:61:13-66:29 -action#android.intent.action.VIEW -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:62:17-69 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:62:25-66 -category#android.intent.category.DEFAULT -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:63:17-76 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:63:27-73 -data -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:64:17-78 - android:mimeType - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:64:23-75 -intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:68:13-73:29 -action#android.intent.action.INSERT_OR_EDIT -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:69:17-79 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:69:25-76 -intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:75:13-78:29 -action#android.intent.action.SEARCH -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:76:17-71 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:76:25-68 -meta-data#android.app.searchable -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:80:13-82:54 - android:resource - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:82:17-51 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:81:17-54 -provider#net.micode.notes.data.NotesProvider -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:85:9-88:43 - android:authorities - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:87:13-47 - android:multiprocess - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:88:13-40 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:86:13-63 -receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:90:9-102:20 - android:label - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:92:13-50 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:91:13-57 -intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:93:13-97:29 -action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:94:17-84 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:94:25-81 -action#android.appwidget.action.APPWIDGET_DELETED -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:95:17-85 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:95:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:96:17-85 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:96:25-82 -meta-data#android.appwidget.provider -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:99:13-101:58 - android:resource - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:101:17-55 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:100:17-58 -receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:103:9-116:20 - android:label - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:105:13-50 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:104:13-57 -receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:118:9-122:20 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:118:19-55 -intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:119:13-121:29 -action#android.intent.action.BOOT_COMPLETED -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:120:17-79 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:120:25-76 -receiver#net.micode.notes.ui.AlarmReceiver -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:124:9-127:20 - android:process - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:126:13-38 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:125:13-61 -activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:129:9-134:20 - android:label - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:131:13-45 - android:launchMode - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:132:13-48 - android:theme - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:133:13-75 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:130:13-50 -activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:136:9-141:20 - android:label - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:138:13-54 - android:launchMode - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:139:13-43 - android:theme - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:140:13-60 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:137:13-71 -service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:143:9-146:19 - android:exported - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:145:13-37 - android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:144:13-74 -meta-data#android.app.default_searchable -ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:148:9-150:52 - android:value - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:150:13-49 + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:150:13-49 android:name - ADDED from E:\MiNotes-master\app\src\main\AndroidManifest.xml:149:13-58 ->>>>>>> local + ADDED from E:\MiNotes\MiNotes-master2\app\src\main\AndroidManifest.xml:149:13-58 diff --git a/代码解读/MiNotes-master/app/local.properties b/代码解读/MiNotes-master/app/local.properties deleted file mode 100644 index c67caa8..0000000 --- a/代码解读/MiNotes-master/app/local.properties +++ /dev/null @@ -1,8 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Wed Mar 08 14:31:32 CST 2023 -sdk.dir=E\:\\SDK diff --git a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/Contact.java b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/Contact.java index d97ac5d..61f0839 100644 --- a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/Contact.java +++ b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/Contact.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package net.micode.notes.data; import android.content.Context; @@ -26,27 +10,43 @@ import android.util.Log; import java.util.HashMap; public class Contact { + + // 声明一个用于缓存联系人的HashMap private static HashMap sContactCache; + + // 声明日志输出的TAG private static final String TAG = "Contact"; + // 定义查询联系人的选择条件，使用占位符 "?" 和 "IN" 子句 private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER - + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" - + " AND " + Data.RAW_CONTACT_ID + " IN " + + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + + " AND " + Data.RAW_CONTACT_ID + " IN " + "(SELECT raw_contact_id " + " FROM phone_lookup" + " WHERE min_match = '+')"; + /** + * 获取联系人名称 + * @param context 上下文环境 + * @param phoneNumber 联系人的电话号码 + * @return 联系人的名称，如果找不到返回null + */ public static String getContact(Context context, String phoneNumber) { + // 如果联系人缓存为空，则创建一个新的HashMap if(sContactCache == null) { sContactCache = new HashMap(); } + // 如果联系人缓存中已经存在该电话号码的联系人，则直接返回联系人名称 if(sContactCache.containsKey(phoneNumber)) { return sContactCache.get(phoneNumber); } + // 使用PhoneNumberUtils工具类将电话号码转换为拨号最小匹配 String selection = CALLER_ID_SELECTION.replace("+", PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); + + // 查询联系人 Cursor cursor = context.getContentResolver().query( Data.CONTENT_URI, new String [] { Phone.DISPLAY_NAME }, @@ -54,6 +54,7 @@ public class Contact { new String[] { phoneNumber }, null); + // 如果查询到联系人，则将联系人名称存入缓存并返回联系人名称 if (cursor != null && cursor.moveToFirst()) { try { String name = cursor.getString(0); @@ -66,8 +67,9 @@ public class Contact { cursor.close(); } } else { + // 如果找不到联系人，则打印日志并返回null Log.d(TAG, "No contact matched with number:" + phoneNumber); return null; } } -} +} \ No newline at end of file diff --git a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index ffe5d57..4721b0c 100644 --- a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package net.micode.notes.data; import android.content.ContentValues; @@ -26,190 +10,195 @@ import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.DataConstants; import net.micode.notes.data.Notes.NoteColumns; - +// 数据库帮助类 public class NotesDatabaseHelper extends SQLiteOpenHelper { - private static final String DB_NAME = "note.db"; - - private static final int DB_VERSION = 4; + private static final String DB_NAME = "note.db"; // 数据库名 + private static final int DB_VERSION = 4; // 数据库版本号 + // 数据表名称常量 public interface TABLE { public static final String NOTE = "note"; - public static final String DATA = "data"; } - private static final String TAG = "NotesDatabaseHelper"; - - private static NotesDatabaseHelper mInstance; + private static final String TAG = "NotesDatabaseHelper"; // 日志tag + private static NotesDatabaseHelper mInstance; // 数据库帮助类实例 + // 创建笔记数据表的SQL语句 private static final String CREATE_NOTE_TABLE_SQL = - "CREATE TABLE " + TABLE.NOTE + "(" + - NoteColumns.ID + " INTEGER PRIMARY KEY," + - NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + - NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + - ")"; - + "CREATE TABLE " + TABLE.NOTE + "(" + + NoteColumns.ID + " INTEGER PRIMARY KEY," + + NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + + NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + + NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + + ")"; + + // 创建笔记内容数据表的SQL语句 private static final String CREATE_DATA_TABLE_SQL = - "CREATE TABLE " + TABLE.DATA + "(" + - DataColumns.ID + " INTEGER PRIMARY KEY," + - DataColumns.MIME_TYPE + " TEXT NOT NULL," + - DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + - DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA1 + " INTEGER," + - DataColumns.DATA2 + " INTEGER," + - DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + - DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + - ")"; - + "CREATE TABLE " + TABLE.DATA + "(" + + DataColumns.ID + " INTEGER PRIMARY KEY," + + DataColumns.MIME_TYPE + " TEXT NOT NULL," + + DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + + DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA1 + " INTEGER," + + DataColumns.DATA2 + " INTEGER," + + DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + + ")"; + /** + *创建笔记在SQL中的Id + */ private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = - "CREATE INDEX IF NOT EXISTS note_id_index ON " + - TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; + //创建一个数据表的索引，用于加速查询和过滤操作。 + "CREATE INDEX IF NOT EXISTS note_id_index ON " + + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; /** - * Increase folder's note count when move note to the folder + * 将笔记移动到文件夹时增加文件夹的笔记计数 */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_update "+ - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; + //当在文件夹中插入新笔记时，该触发器会自动更新该文件夹中的笔记计数。 + "CREATE TRIGGER increase_folder_count_on_update "+ + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END"; /** - * Decrease folder's note count when move note from folder + * 将笔记从文件夹移出时减少文件夹的笔记计数 */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_update " + - " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + - " END"; + //：当笔记从一个文件夹中移出时，该触发器会自动更新该文件夹中的笔记计数。 + "CREATE TRIGGER decrease_folder_count_on_update " + + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + + " END"; /** - * Increase folder's note count when insert new note to the folder + * 在文件夹中插入新笔记时增加文件夹的笔记计数 */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_insert " + - " AFTER INSERT ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; + //当笔记被移动到一个文件夹时，该触发器会自动更新该文件夹中的笔记计数。 + "CREATE TRIGGER increase_folder_count_on_insert " + + " AFTER INSERT ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END"; /** - * Decrease folder's note count when delete note from the folder + * 减少文件夹中的笔记数量（当从文件夹中删除笔记时） */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0;" + - " END"; + "CREATE TRIGGER decrease_folder_count_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0;" + + " END"; /** - * Update note's content when insert data with type {@link DataConstants#NOTE} + * 在插入类型为 {@link DataConstants#NOTE} 的数据时更新笔记的内容 */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = - "CREATE TRIGGER update_note_content_on_insert " + - " AFTER INSERT ON " + TABLE.DATA + - " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; + "CREATE TRIGGER update_note_content_on_insert " + + " AFTER INSERT ON " + TABLE.DATA + + " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + + " END"; /** - * Update note's content when data with {@link DataConstants#NOTE} type has changed + * 在类型为 {@link DataConstants#NOTE} 的数据更新时更新笔记的内容 */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER update_note_content_on_update " + - " AFTER UPDATE ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; + "CREATE TRIGGER update_note_content_on_update " + + " AFTER UPDATE ON " + TABLE.DATA + + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + + " END"; /** - * Update note's content when data with {@link DataConstants#NOTE} type has deleted + * 在类型为 {@link DataConstants#NOTE} 的数据删除时更新笔记的内容 */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = - "CREATE TRIGGER update_note_content_on_delete " + - " AFTER delete ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=''" + - " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + - " END"; - + "CREATE TRIGGER update_note_content_on_delete " + + " AFTER delete ON " + TABLE.DATA + + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=''" + + " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + + " END"; /** - * Delete datas belong to note which has been deleted + * 创建一个触发器，用于删除已删除笔记的数据 */ private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = - "CREATE TRIGGER delete_data_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.DATA + - " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + - " END"; + "CREATE TRIGGER delete_data_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN" + + " DELETE FROM " + TABLE.DATA + + " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + + " END"; /** - * Delete notes belong to folder which has been deleted + * 创建一个触发器，用于删除已删除文件夹的笔记 */ private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = - "CREATE TRIGGER folder_delete_notes_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.NOTE + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; + "CREATE TRIGGER folder_delete_notes_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN" + + " DELETE FROM " + TABLE.NOTE + + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + + " END"; /** - * Move notes belong to folder which has been moved to trash folder + * 创建一个触发器，用于将被移动到垃圾箱文件夹中的笔记移动到垃圾箱中 */ private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = - "CREATE TRIGGER folder_move_notes_on_trash " + - " AFTER UPDATE ON " + TABLE.NOTE + - " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; - + "CREATE TRIGGER folder_move_notes_on_trash " + + " AFTER UPDATE ON " + TABLE.NOTE + + " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + + " END"; + //数据库帮助 public NotesDatabaseHelper(Context context) { super(context, DB_NAME, null, DB_VERSION); } - + //创建数据库实例 public void createNoteTable(SQLiteDatabase db) { db.execSQL(CREATE_NOTE_TABLE_SQL); reCreateNoteTableTriggers(db); @@ -217,53 +206,80 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { Log.d(TAG, "note table has been created"); } + /** + + 重新创建笔记表的触发器 + + @param db 数据库对象 + */ private void reCreateNoteTableTriggers(SQLiteDatabase db) { db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); + // 删除更新时增加文件夹计数的触发器 db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update"); + // 删除更新时减少文件夹计数的触发器 db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete"); + // 删除删除时减少文件夹计数的触发器 db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete"); + // 删除删除时删除数据的触发器 db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert"); + // 删除插入时增加文件夹计数的触发器 db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete"); + // 删除文件夹删除时删除笔记的触发器 db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash"); + // 删除将笔记移动到垃圾桶时的触发器 db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); + // 创建更新时增加文件夹计数的触发器 db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); + // 创建更新时减少文件夹计数的触发器 db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER); + // 创建删除时减少文件夹计数的触发器 db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER); + // 创建删除时删除数据的触发器 db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER); + // 创建插入时增加文件夹计数的触发器 db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER); + // 创建文件夹删除时删除笔记的触发器 db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); + // 创建将笔记移动到垃圾桶时的触发器 } + /** + + 创建系统文件夹 + + @param db 数据库对象 + */ private void createSystemFolder(SQLiteDatabase db) { ContentValues values = new ContentValues(); - /** - * call record foler for call notes - */ +/** + + 通话记录文件夹 + */ values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); +/** - /** - * root folder which is default folder - */ + 根文件夹，即默认文件夹 + */ values.clear(); values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); +/** - /** - * temporary folder which is used for moving note - */ + 临时文件夹，用于移动笔记 + */ values.clear(); values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); +/** - /** - * create trash folder - */ + 创建垃圾桶文件夹 + */ values.clear(); values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); @@ -271,68 +287,67 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { } public void createDataTable(SQLiteDatabase db) { - db.execSQL(CREATE_DATA_TABLE_SQL); - reCreateDataTableTriggers(db); - db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL); - Log.d(TAG, "data table has been created"); + db.execSQL(CREATE_DATA_TABLE_SQL); // 创建数据表 + reCreateDataTableTriggers(db); // 重建数据表触发器 + db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL); // 在数据表上创建笔记 ID 索引 + Log.d(TAG, "data table has been created"); // 输出日志，表示数据表已创建 } private void reCreateDataTableTriggers(SQLiteDatabase db) { - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update"); - db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete"); + db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");// 如果存在，删除插入时更新笔记内容的触发器 + db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update"); // 如果存在，删除更新时更新笔记内容的触发器 + db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete");// 如果存在，删除删除时更新笔记内容的触发器 - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER); - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER); - db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER); + db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER); // 创建插入时更新笔记内容的触发器 + db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER); // 创建更新时更新笔记内容的触发器 + db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER); // 创建删除时更新笔记内容的触发器 } static synchronized NotesDatabaseHelper getInstance(Context context) { if (mInstance == null) { - mInstance = new NotesDatabaseHelper(context); + mInstance = new NotesDatabaseHelper(context); // 如果实例为空，创建新的实例 } - return mInstance; + return mInstance; // 返回实例 } @Override public void onCreate(SQLiteDatabase db) { - createNoteTable(db); - createDataTable(db); + createNoteTable(db); // 创建笔记表 + createDataTable(db); // 创建数据表 } @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - boolean reCreateTriggers = false; - boolean skipV2 = false; + boolean reCreateTriggers = false; // 是否需要重新创建触发器 + boolean skipV2 = false; // 是否跳过版本 2 if (oldVersion == 1) { - upgradeToV2(db); - skipV2 = true; // this upgrade including the upgrade from v2 to v3 - oldVersion++; + upgradeToV2(db); // 升级到版本 2 + skipV2 = true; // 标记跳过版本 2（因为版本 2 升级包含在版本 3 升级中） + oldVersion++; // 版本号加 1 } if (oldVersion == 2 && !skipV2) { - upgradeToV3(db); - reCreateTriggers = true; - oldVersion++; + upgradeToV3(db); // 升级到版本 3 + reCreateTriggers = true; // 标记需要重新创建触发器 + oldVersion++; // 版本号加 1 } if (oldVersion == 3) { - upgradeToV4(db); - oldVersion++; + upgradeToV4(db); // 升级到版本 4 + oldVersion++; // 版本号加 1 } if (reCreateTriggers) { - reCreateNoteTableTriggers(db); - reCreateDataTableTriggers(db); + reCreateNoteTableTriggers(db); // 重新创建笔记表触发器 + reCreateDataTableTriggers(db); // 重新创建数据表触发器 } if (oldVersion != newVersion) { throw new IllegalStateException("Upgrade notes database to version " + newVersion - + "fails"); + + "fails"); // 如果版本升级失败，抛出异常 } } - private void upgradeToV2(SQLiteDatabase db) { db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); diff --git a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java index edb0a60..013a415 100644 --- a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java @@ -1,22 +1,5 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package net.micode.notes.data; - import android.app.SearchManager; import android.content.ContentProvider; import android.content.ContentUris; @@ -34,22 +17,24 @@ import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.NotesDatabaseHelper.TABLE; - public class NotesProvider extends ContentProvider { + + // 声明一个 UriMatcher 对象，用于匹配 Uri 和对应的代码 private static final UriMatcher mMatcher; private NotesDatabaseHelper mHelper; private static final String TAG = "NotesProvider"; - private static final int URI_NOTE = 1; - private static final int URI_NOTE_ITEM = 2; - private static final int URI_DATA = 3; - private static final int URI_DATA_ITEM = 4; - - private static final int URI_SEARCH = 5; - private static final int URI_SEARCH_SUGGEST = 6; + // 声明一些常量，用于标识 Uri 匹配的类型 + private static final int URI_NOTE = 1; + private static final int URI_NOTE_ITEM = 2; + private static final int URI_DATA = 3; + private static final int URI_DATA_ITEM = 4; + private static final int URI_SEARCH = 5; + private static final int URI_SEARCH_SUGGEST = 6; + // 初始化 UriMatcher 对象，将 Uri 和对应的类型添加到 UriMatcher 中 static { mMatcher = new UriMatcher(UriMatcher.NO_MATCH); mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE); @@ -60,63 +45,81 @@ public class NotesProvider extends ContentProvider { mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST); mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST); } - +/****************/ /** - * x'0A' represents the '\n' character in sqlite. For title and content in the search result, - * we will trim '\n' and white space in order to show more information. + * x'0A' 代表 sqlite 中的 '\n' 字符。对于搜索结果中的标题和内容，我们会去掉 '\n' 和空格，以展示更多信息。 */ private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," - + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," - + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," - + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + "," - + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," - + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," - + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; + + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," + + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," + + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + "," + + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," + + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," + + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; + /** + * 定义搜索笔记的 SQL 查询语句，其中包括笔记的搜索投影和搜索条件。 + */ private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION - + " FROM " + TABLE.NOTE - + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" - + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER - + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; + + " FROM " + TABLE.NOTE + + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" + + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; @Override public boolean onCreate() { + // 获取数据库帮助类的实例 mHelper = NotesDatabaseHelper.getInstance(getContext()); return true; } + /******/ @Override public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, - String sortOrder) { + String sortOrder) { + // 初始化游标和数据库 Cursor c = null; SQLiteDatabase db = mHelper.getReadableDatabase(); + // 初始化 id String id = null; + // 根据 Uri 的不同，执行不同的查询操作 switch (mMatcher.match(uri)) { + // 查询所有笔记 case URI_NOTE: c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, sortOrder); break; + // 根据 id 查询笔记 case URI_NOTE_ITEM: + // 获取 Uri 中的 id id = uri.getPathSegments().get(1); + // 根据 id 查询笔记 c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs, null, null, sortOrder); break; + // 查询所有数据 case URI_DATA: c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null, sortOrder); break; + // 根据 id 查询数据 case URI_DATA_ITEM: + // 获取 Uri 中的 id id = uri.getPathSegments().get(1); + // 根据 id 查询数据 c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs, null, null, sortOrder); break; + // 查询笔记的搜索结果 case URI_SEARCH: case URI_SEARCH_SUGGEST: + // 如果查询中包含排序或者 projection，则抛出异常 if (sortOrder != null || projection != null) { throw new IllegalArgumentException( "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query"); } + // 获取查询的关键词 String searchString = null; if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { if (uri.getPathSegments().size() > 1) { @@ -126,152 +129,204 @@ public class NotesProvider extends ContentProvider { searchString = uri.getQueryParameter("pattern"); } + // 如果关键词为空，则返回空游标 if (TextUtils.isEmpty(searchString)) { return null; } try { + // 格式化查询字符串 searchString = String.format("%%%s%%", searchString); + // 执行笔记搜索查询 c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY, - new String[] { searchString }); + new String[]{searchString}); } catch (IllegalStateException ex) { Log.e(TAG, "got exception: " + ex.toString()); } break; + // 如果 Uri 不匹配，则抛出异常 default: throw new IllegalArgumentException("Unknown URI " + uri); } + // 如果游标不为空，则设置游标的内容变化通知 Uri if (c != null) { c.setNotificationUri(getContext().getContentResolver(), uri); } return c; } + /***********/ @Override public Uri insert(Uri uri, ContentValues values) { + // 获取可写的 SQLiteDatabase 实例 SQLiteDatabase db = mHelper.getWritableDatabase(); + // 定义变量用于存储插入后的数据行 ID long dataId = 0, noteId = 0, insertedId = 0; + // 根据传入的 Uri 进行不同的插入操作 switch (mMatcher.match(uri)) { case URI_NOTE: + // 如果是插入 Note 数据表 insertedId = noteId = db.insert(TABLE.NOTE, null, values); break; case URI_DATA: + // 如果是插入 Data 数据表 if (values.containsKey(DataColumns.NOTE_ID)) { + // 获取 Note ID noteId = values.getAsLong(DataColumns.NOTE_ID); } else { + // 如果 ContentValues 中没有 Note ID，记录日志并退出方法 Log.d(TAG, "Wrong data format without note id:" + values.toString()); } + // 插入数据行 insertedId = dataId = db.insert(TABLE.DATA, null, values); break; default: + // 如果传入的 Uri 不合法，抛出 IllegalArgumentException 异常 throw new IllegalArgumentException("Unknown URI " + uri); } - // Notify the note uri + // 如果插入操作成功，通知相关 Uri 的观察者 + // 通知 Note Uri if (noteId > 0) { getContext().getContentResolver().notifyChange( ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null); } - - // Notify the data uri + // 通知 Data Uri if (dataId > 0) { getContext().getContentResolver().notifyChange( ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null); } - + // 返回新插入数据的 Uri return ContentUris.withAppendedId(uri, insertedId); } + /*******************/ @Override public int delete(Uri uri, String selection, String[] selectionArgs) { + // 初始化变量 int count = 0; String id = null; SQLiteDatabase db = mHelper.getWritableDatabase(); boolean deleteData = false; + + // 使用 switch-case 语句匹配传入的 Uri switch (mMatcher.match(uri)) { + // 如果是 URI_NOTE，表示删除笔记 case URI_NOTE: + // 将选定条件和 "ID>0" 结合起来 selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 "; + // 执行删除操作，并返回受影响的行数 count = db.delete(TABLE.NOTE, selection, selectionArgs); break; + // 如果是 URI_NOTE_ITEM，表示删除单个笔记 case URI_NOTE_ITEM: + // 从 Uri 中获取笔记的 ID id = uri.getPathSegments().get(1); - /** - * ID that smaller than 0 is system folder which is not allowed to - * trash - */ + // 如果笔记 ID 小于等于 0，则不允许删除 long noteId = Long.valueOf(id); if (noteId <= 0) { break; } + // 执行删除操作，并返回受影响的行数 count = db.delete(TABLE.NOTE, NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); break; + // 如果是 URI_DATA，表示删除数据 case URI_DATA: + // 执行删除操作，并返回受影响的行数 count = db.delete(TABLE.DATA, selection, selectionArgs); deleteData = true; break; + // 如果是 URI_DATA_ITEM，表示删除单个数据 case URI_DATA_ITEM: + // 从 Uri 中获取数据的 ID id = uri.getPathSegments().get(1); + // 执行删除操作，并返回受影响的行数 count = db.delete(TABLE.DATA, DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs); deleteData = true; break; + // 如果匹配失败，则抛出异常 default: throw new IllegalArgumentException("Unknown URI " + uri); } + + // 如果受影响的行数大于 0 if (count > 0) { + // 如果删除了数据，则通知数据发生了变化 if (deleteData) { getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); } + // 通知 Uri 发生了变化 getContext().getContentResolver().notifyChange(uri, null); } + + // 返回受影响的行数 return count; } + /******/ @Override public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { int count = 0; String id = null; SQLiteDatabase db = mHelper.getWritableDatabase(); boolean updateData = false; + + // 根据 Uri 进行分支处理 switch (mMatcher.match(uri)) { case URI_NOTE: + // 更新笔记版本号 increaseNoteVersion(-1, selection, selectionArgs); + // 更新笔记数据 count = db.update(TABLE.NOTE, values, selection, selectionArgs); break; case URI_NOTE_ITEM: + // 获取 Uri 中的 id id = uri.getPathSegments().get(1); + // 更新笔记版本号 increaseNoteVersion(Long.valueOf(id), selection, selectionArgs); + // 根据 id 更新笔记数据 count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); break; case URI_DATA: + // 更新数据表 count = db.update(TABLE.DATA, values, selection, selectionArgs); updateData = true; break; case URI_DATA_ITEM: + // 获取 Uri 中的 id id = uri.getPathSegments().get(1); + // 根据 id 更新数据表 count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs); updateData = true; break; default: + // 如果不匹配任何 Uri，抛出异常 throw new IllegalArgumentException("Unknown URI " + uri); } + // 如果更新成功，发出通知 if (count > 0) { if (updateData) { + // 更新数据表时，通知笔记 Uri getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); } + // 通知当前 Uri getContext().getContentResolver().notifyChange(uri, null); } return count; } + /*****/ private String parseSelection(String selection) { + // 如果查询条件不为空，返回 AND (查询条件) return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); } private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { + // 构建 SQL 语句 StringBuilder sql = new StringBuilder(120); sql.append("UPDATE "); sql.append(TABLE.NOTE); @@ -279,13 +334,17 @@ public class NotesProvider extends ContentProvider { sql.append(NoteColumns.VERSION); sql.append("=" + NoteColumns.VERSION + "+1 "); + // 如果传入的 ID 或者查询条件不为空，则在 SQL 语句中添加 WHERE 子句 if (id > 0 || !TextUtils.isEmpty(selection)) { sql.append(" WHERE "); } + // 如果传入的 ID 不为空，添加 ID 条件 if (id > 0) { sql.append(NoteColumns.ID + "=" + String.valueOf(id)); } + // 如果查询条件不为空，添加查询条件 if (!TextUtils.isEmpty(selection)) { + // 解析查询条件中的参数 String selectString = id > 0 ? parseSelection(selection) : selection; for (String args : selectionArgs) { selectString = selectString.replaceFirst("\\?", args); @@ -293,13 +352,13 @@ public class NotesProvider extends ContentProvider { sql.append(selectString); } + // 执行 SQL 语句，增加笔记版本号 mHelper.getWritableDatabase().execSQL(sql.toString()); } @Override public String getType(Uri uri) { - // TODO Auto-generated method stub + // 返回 null return null; } - -} +} \ No newline at end of file diff --git a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java index 3a2050b..6ac705d 100644 --- a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java +++ b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java @@ -1,21 +1,8 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/** + MetaData类是Task类的子类，表示GTask的元数据。 + */ package net.micode.notes.gtask.data; - import android.database.Cursor; import android.util.Log; @@ -24,36 +11,52 @@ import net.micode.notes.tool.GTaskStringUtils; import org.json.JSONException; import org.json.JSONObject; - public class MetaData extends Task { private final static String TAG = MetaData.class.getSimpleName(); - + // 关联的gid private String mRelatedGid = null; + /** + * 设置元数据的gid和相关信息 + * + * @param gid 元数据的gid + * @param metaInfo 元数据的相关信息 + */ public void setMeta(String gid, JSONObject metaInfo) { try { + // 将关联的gid放入JSONObject中 metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid); } catch (JSONException e) { Log.e(TAG, "failed to put related gid"); } + // 将元数据的相关信息转换为字符串，设置为Task的notes setNotes(metaInfo.toString()); + // 设置Task的名称为元数据的名称 setName(GTaskStringUtils.META_NOTE_NAME); } - public String getRelatedGid() { return mRelatedGid; } + /** + * 判断元数据是否有值。 + * @return 如果有备注信息则返回true，否则返回false。 + */ @Override public boolean isWorthSaving() { return getNotes() != null; } + /** + * 通过远程JSON对象设置元数据内容。 + * @param js 远程JSON对象。 + */ @Override public void setContentByRemoteJSON(JSONObject js) { super.setContentByRemoteJSON(js); if (getNotes() != null) { try { + // 解析备注信息 JSONObject metaInfo = new JSONObject(getNotes().trim()); mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID); } catch (JSONException e) { @@ -63,20 +66,31 @@ public class MetaData extends Task { } } + /** + * 本地JSON对象不应该调用该方法。 + * @param js 本地JSON对象。 + */ @Override public void setContentByLocalJSON(JSONObject js) { - // this function should not be called + // 不应该被调用的方法 throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called"); } + /** + * 不应该被调用的方法。 + * @return 不应该被调用的方法。 + */ @Override public JSONObject getLocalJSONFromContent() { throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called"); } + /******/ +/*该方法接受一个 Cursor 参数，返回一个整型值。 +方法体中抛出了一个 IllegalAccessError 异常，并指定了异常消息为 "MetaData:getSyncAction should not be called"，即 "MetaData:getSyncAction 不应该被调用"。*/ @Override public int getSyncAction(Cursor c) { throw new IllegalAccessError("MetaData:getSyncAction should not be called"); } -} +} \ No newline at end of file diff --git a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java index 63950e0..ffe7545 100644 --- a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java +++ b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java @@ -22,80 +22,86 @@ import org.json.JSONObject; public abstract class Node { public static final int SYNC_ACTION_NONE = 0; - + //同步行为-无操作 public static final int SYNC_ACTION_ADD_REMOTE = 1; - + //同步行为-添加远程 public static final int SYNC_ACTION_ADD_LOCAL = 2; - + //同步行为-添加本地 public static final int SYNC_ACTION_DEL_REMOTE = 3; - + //：同步行为-删除远程 public static final int SYNC_ACTION_DEL_LOCAL = 4; - + //同步行为-删除本地 public static final int SYNC_ACTION_UPDATE_REMOTE = 5; - + //同步行为-更新远程 public static final int SYNC_ACTION_UPDATE_LOCAL = 6; - + //同步行为-更新本地 public static final int SYNC_ACTION_UPDATE_CONFLICT = 7; - + //同步行为-更新冲突 public static final int SYNC_ACTION_ERROR = 8; - + //：同步行为-错误 private String mGid; - + //表示节点的全局唯一标识符（global identifier） private String mName; - + //表示节点的名称 private long mLastModified; - + //表示节点最后一次修改时间 private boolean mDeleted; - - public Node() { - mGid = null; - mName = ""; - mLastModified = 0; - mDeleted = false; - } - + //表示节点是否已被删除 + // 抽象方法，获取创建操作的 JSON 对象 public abstract JSONObject getCreateAction(int actionId); + // 抽象方法，获取更新操作的 JSON 对象 public abstract JSONObject getUpdateAction(int actionId); + // 抽象方法，根据远程 JSON 对象设置内容 public abstract void setContentByRemoteJSON(JSONObject js); + // 抽象方法，根据本地 JSON 对象设置内容 public abstract void setContentByLocalJSON(JSONObject js); + // 抽象方法，将内容转换为本地 JSON 对象 public abstract JSONObject getLocalJSONFromContent(); + // 抽象方法，根据游标获取同步操作类型 public abstract int getSyncAction(Cursor c); + // 设置节点 ID public void setGid(String gid) { this.mGid = gid; } + // 设置节点名称 public void setName(String name) { this.mName = name; } + // 设置最后修改时间 public void setLastModified(long lastModified) { this.mLastModified = lastModified; } + // 设置是否已删除 public void setDeleted(boolean deleted) { this.mDeleted = deleted; } + // 获取节点 ID public String getGid() { return this.mGid; } + // 获取节点名称 public String getName() { return this.mName; } + // 获取最后修改时间 public long getLastModified() { return this.mLastModified; } + // 获取是否已删除 public boolean getDeleted() { return this.mDeleted; } - } diff --git a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java index d3ec3be..7e8c3be 100644 --- a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java +++ b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java @@ -36,41 +36,33 @@ import org.json.JSONObject; public class SqlData { - private static final String TAG = SqlData.class.getSimpleName(); + private static final String TAG = SqlData.class.getSimpleName(); // TAG常量，用于在日志中标记这个类 - private static final int INVALID_ID = -99999; + private static final int INVALID_ID = -99999; // 无效ID常量 + // PROJECTION_DATA常量数组，用于查询数据表中的字段 public static final String[] PROJECTION_DATA = new String[] { DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1, DataColumns.DATA3 }; + // 数据表字段的索引常量，用于读取查询结果集 public static final int DATA_ID_COLUMN = 0; - public static final int DATA_MIME_TYPE_COLUMN = 1; - public static final int DATA_CONTENT_COLUMN = 2; - public static final int DATA_CONTENT_DATA_1_COLUMN = 3; - public static final int DATA_CONTENT_DATA_3_COLUMN = 4; - private ContentResolver mContentResolver; - - private boolean mIsCreate; - - private long mDataId; - - private String mDataMimeType; - - private String mDataContent; - - private long mDataContentData1; - - private String mDataContentData3; - - private ContentValues mDiffDataValues; + private ContentResolver mContentResolver; // ContentResolver对象，用于操作数据表 + private boolean mIsCreate; // 是否创建了数据 + private long mDataId; // 数据ID + private String mDataMimeType; // 数据类型 + private String mDataContent; // 数据内容 + private long mDataContentData1; // 数据字段1 + private String mDataContentData3; // 数据字段3 + private ContentValues mDiffDataValues; // ContentValues对象，用于更新数据表的内容 + // 构造函数，初始化ContentResolver对象 public SqlData(Context context) { mContentResolver = context.getContentResolver(); mIsCreate = true; @@ -89,52 +81,58 @@ public class SqlData { mDiffDataValues = new ContentValues(); } + // 从Cursor对象中读取数据 private void loadFromCursor(Cursor c) { - mDataId = c.getLong(DATA_ID_COLUMN); - mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN); - mDataContent = c.getString(DATA_CONTENT_COLUMN); - mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN); - mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN); + mDataId = c.getLong(DATA_ID_COLUMN); // 读取数据ID + mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN); // 读取数据类型 + mDataContent = c.getString(DATA_CONTENT_COLUMN); // 读取数据内容 + mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN); // 读取数据字段1 + mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN); // 读取数据字段3 } + // 设置数据内容 public void setContent(JSONObject js) throws JSONException { + // 从JSONObject对象中读取数据，若不存在则使用默认值 long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID; + String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE) + : DataConstants.NOTE; + String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : ""; + long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0; + String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : ""; + + // 比较新数据和旧数据，如果不同则添加到ContentValues对象中 if (mIsCreate || mDataId != dataId) { mDiffDataValues.put(DataColumns.ID, dataId); } mDataId = dataId; - String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE) - : DataConstants.NOTE; if (mIsCreate || !mDataMimeType.equals(dataMimeType)) { mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType); } mDataMimeType = dataMimeType; - String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : ""; if (mIsCreate || !mDataContent.equals(dataContent)) { mDiffDataValues.put(DataColumns.CONTENT, dataContent); } mDataContent = dataContent; - long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0; if (mIsCreate || mDataContentData1 != dataContentData1) { mDiffDataValues.put(DataColumns.DATA1, dataContentData1); } mDataContentData1 = dataContentData1; - String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : ""; if (mIsCreate || !mDataContentData3.equals(dataContentData3)) { mDiffDataValues.put(DataColumns.DATA3, dataContentData3); } mDataContentData3 = dataContentData3; } - public JSONObject getContent() throws JSONException { + // 如果数据还没有在数据库中创建，则返回null，并打印错误日志 if (mIsCreate) { Log.e(TAG, "it seems that we haven't created this in database yet"); return null; } + // 将数据内容转换为JSONObject对象，并返回 JSONObject js = new JSONObject(); js.put(DataColumns.ID, mDataId); js.put(DataColumns.MIME_TYPE, mDataMimeType); @@ -143,46 +141,50 @@ public class SqlData { js.put(DataColumns.DATA3, mDataContentData3); return js; } - public void commit(long noteId, boolean validateVersion, long version) { - + // 如果数据还没有在数据库中创建，则将其插入到数据库中 if (mIsCreate) { + // 如果数据id无效且存在于差异数据值中，则从差异数据值中删除该id if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) { mDiffDataValues.remove(DataColumns.ID); } - + // 将数据与所属笔记的id关联起来，并将其插入到数据库中 mDiffDataValues.put(DataColumns.NOTE_ID, noteId); Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues); try { + // 从uri中获取新插入数据的id mDataId = Long.valueOf(uri.getPathSegments().get(1)); } catch (NumberFormatException e) { Log.e(TAG, "Get note id error :" + e.toString()); throw new ActionFailureException("create note failed"); } } else { + // 如果数据已存在于数据库中，则将其更新 if (mDiffDataValues.size() > 0) { int result = 0; + // 如果需要验证版本号，则只有当笔记的版本号与指定版本号相同时，才能更新数据 if (!validateVersion) { result = mContentResolver.update(ContentUris.withAppendedId( Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null); } else { result = mContentResolver.update(ContentUris.withAppendedId( - Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, + Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE + " WHERE " + NoteColumns.VERSION + "=?)", new String[] { String.valueOf(noteId), String.valueOf(version) }); } + // 如果更新的数据数量为0，则打印警告日志 if (result == 0) { Log.w(TAG, "there is no update. maybe user updates note when syncing"); } } } - + // 清空差异数据值，并将是否创建标志设为false mDiffDataValues.clear(); mIsCreate = false; } - + //返回数据索引 public long getId() { return mDataId; } diff --git a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java index 39f6ec4..3288f51 100644 --- a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java +++ b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package net.micode.notes.tool; import android.content.Context; @@ -35,7 +19,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintStream; - public class BackupUtils { private static final String TAG = "BackupUtils"; // Singleton stuff @@ -49,18 +32,17 @@ public class BackupUtils { } /** - * Following states are signs to represents backup or restore - * status + * 下面的几个常量表示备份或者还原的状态 */ - // Currently, the sdcard is not mounted + // 当前SD卡未挂载 public static final int STATE_SD_CARD_UNMOUONTED = 0; - // The backup file not exist + // 备份文件不存在 public static final int STATE_BACKUP_FILE_NOT_EXIST = 1; - // The data is not well formated, may be changed by other programs + // 数据格式错误，可能被其他程序更改 public static final int STATE_DATA_DESTROIED = 2; - // Some run-time exception which causes restore or backup fails + // 运行时异常，导致备份或还原失败 public static final int STATE_SYSTEM_ERROR = 3; - // Backup or restore success + // 备份或还原成功 public static final int STATE_SUCCESS = 4; private TextExport mTextExport; @@ -73,14 +55,23 @@ public class BackupUtils { return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()); } + /** + * 导出为文本文件 + */ public int exportToText() { return mTextExport.exportToText(); } + /** + * 获取导出的文本文件名 + */ public String getExportedTextFileName() { return mTextExport.mFileName; } + /** + * 获取导出的文本文件路径 + */ public String getExportedTextFileDir() { return mTextExport.mFileDirectory; } @@ -108,52 +99,89 @@ public class BackupUtils { DataColumns.DATA4, }; + //1 + // 数据列索引：内容 private static final int DATA_COLUMN_CONTENT = 0; + // 数据列索引：MIME 类型 private static final int DATA_COLUMN_MIME_TYPE = 1; + // 数据列索引：通话日期 private static final int DATA_COLUMN_CALL_DATE = 2; + // 数据列索引：电话号码 private static final int DATA_COLUMN_PHONE_NUMBER = 4; + // 导出文本格式 private final String [] TEXT_FORMAT; - private static final int FORMAT_FOLDER_NAME = 0; - private static final int FORMAT_NOTE_DATE = 1; - private static final int FORMAT_NOTE_CONTENT = 2; + // 导出文本格式中的索引：文件夹名称 + private static final int FORMAT_FOLDER_NAME = 0; + + // 导出文本格式中的索引：笔记日期 + private static final int FORMAT_NOTE_DATE = 1; + + // 导出文本格式中的索引：笔记内容 + private static final int FORMAT_NOTE_CONTENT = 2; + + // 上下文对象 private Context mContext; + + // 文件名 private String mFileName; + + // 文件目录 private String mFileDirectory; + /** + + 构造函数，接受一个上下文对象 + */ public TextExport(Context context) { +// 获取导出文本的格式 TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note); + +// 设置上下文对象 mContext = context; + +// 初始化文件名和目录 mFileName = ""; mFileDirectory = ""; } + /** + + 获取导出文本格式中特定索引对应的字符串 + */ private String getFormat(int id) { return TEXT_FORMAT[id]; } - /** - * Export the folder identified by folder id to text + + 导出指定 ID 的文件夹中的所有笔记到文本 */ private void exportFolderToText(String folderId, PrintStream ps) { - // Query notes belong to this folder - Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI, - NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] { - folderId - }, null); +// 查询属于此文件夹的所有笔记 + Cursor notesCursor = mContext.getContentResolver().query( + Notes.CONTENT_NOTE_URI, + NOTE_PROJECTION, + NoteColumns.PARENT_ID + "=?", + new String[] { folderId }, + null + ); if (notesCursor != null) { if (notesCursor.moveToFirst()) { do { - // Print note's last modified date - ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format( - mContext.getString(R.string.format_datetime_mdhm), - notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE)))); - // Query data belong to this note +// 输出笔记的最后修改日期 + ps.println(String.format( + getFormat(FORMAT_NOTE_DATE), + DateFormat.format( + mContext.getString(R.string.format_datetime_mdhm), + notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE) + ) + )); + // 查询属于此笔记的所有数据 String noteId = notesCursor.getString(NOTE_COLUMN_ID); exportNoteToText(noteId, ps); } while (notesCursor.moveToNext()); @@ -161,14 +189,18 @@ public class BackupUtils { notesCursor.close(); } } - +//2 /** * Export note identified by id to a print stream */ + /** + * 将指定noteId的Note数据导出到文本文件 + */ private void exportNoteToText(String noteId, PrintStream ps) { + // 查询属于该note的数据 Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] { - noteId + noteId }, null); if (dataCursor != null) { @@ -176,27 +208,30 @@ public class BackupUtils { do { String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE); if (DataConstants.CALL_NOTE.equals(mimeType)) { - // Print phone number + // 如果是Call Note类型，则导出电话号码、通话日期和附件位置信息 String phoneNumber = dataCursor.getString(DATA_COLUMN_PHONE_NUMBER); long callDate = dataCursor.getLong(DATA_COLUMN_CALL_DATE); String location = dataCursor.getString(DATA_COLUMN_CONTENT); if (!TextUtils.isEmpty(phoneNumber)) { + // 打印电话号码 ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), phoneNumber)); } - // Print call date + // 打印通话日期 ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), DateFormat .format(mContext.getString(R.string.format_datetime_mdhm), callDate))); - // Print call attachment location + // 打印附件位置信息 if (!TextUtils.isEmpty(location)) { ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), location)); } } else if (DataConstants.NOTE.equals(mimeType)) { + // 如果是Note类型，则导出内容 String content = dataCursor.getString(DATA_COLUMN_CONTENT); if (!TextUtils.isEmpty(content)) { + // 打印Note内容 ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), content)); } @@ -205,7 +240,7 @@ public class BackupUtils { } dataCursor.close(); } - // print a line separator between note + // 打印一个分隔线，用于区分不同的Note try { ps.write(new byte[] { Character.LINE_SEPARATOR, Character.LETTER_NUMBER @@ -215,21 +250,31 @@ public class BackupUtils { } } +//3 /** * Note will be exported as text which is user readable */ + /** + + 将笔记数据导出为文本文件 + + @return 导出状态码 + */ public int exportToText() { +// 检查外部存储是否可用 if (!externalStorageAvailable()) { - Log.d(TAG, "Media was not mounted"); + Log.d(TAG, "存储介质未挂载"); return STATE_SD_CARD_UNMOUONTED; } +// 获取导出文本文件的打印流 PrintStream ps = getExportToTextPrintStream(); if (ps == null) { - Log.e(TAG, "get print stream error"); + Log.e(TAG, "获取打印流失败"); return STATE_SYSTEM_ERROR; } - // First export folder and its notes + +// 首先导出文件夹及其内的笔记 Cursor folderCursor = mContext.getContentResolver().query( Notes.CONTENT_NOTE_URI, NOTE_PROJECTION, @@ -240,7 +285,7 @@ public class BackupUtils { if (folderCursor != null) { if (folderCursor.moveToFirst()) { do { - // Print folder's name +// 打印文件夹名称 String folderName = ""; if(folderCursor.getLong(NOTE_COLUMN_ID) == Notes.ID_CALL_RECORD_FOLDER) { folderName = mContext.getString(R.string.call_record_folder_name); @@ -257,20 +302,20 @@ public class BackupUtils { folderCursor.close(); } - // Export notes in root's folder +// 导出根目录下的笔记 Cursor noteCursor = mContext.getContentResolver().query( Notes.CONTENT_NOTE_URI, NOTE_PROJECTION, NoteColumns.TYPE + "=" + +Notes.TYPE_NOTE + " AND " + NoteColumns.PARENT_ID + "=0", null, null); - if (noteCursor != null) { if (noteCursor.moveToFirst()) { do { +// 打印笔记的最后修改时间 ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format( mContext.getString(R.string.format_datetime_mdhm), noteCursor.getLong(NOTE_COLUMN_MODIFIED_DATE)))); - // Query data belong to this note +// 导出笔记的数据 String noteId = noteCursor.getString(NOTE_COLUMN_ID); exportNoteToText(noteId, ps); } while (noteCursor.moveToNext()); @@ -278,22 +323,29 @@ public class BackupUtils { noteCursor.close(); } ps.close(); - return STATE_SUCCESS; } - +//4 /** * Get a print stream pointed to the file {@generateExportedTextFile} */ + /** + + 获取输出文本流 + @return 输出文本流 + */ private PrintStream getExportToTextPrintStream() { +// 生成文件对象 File file = generateFileMountedOnSDcard(mContext, R.string.file_path, R.string.file_name_txt_format); if (file == null) { Log.e(TAG, "create file to exported failed"); return null; } +// 记录文件名和文件目录 mFileName = file.getName(); mFileDirectory = mContext.getString(R.string.file_path); +// 创建输出文本流 PrintStream ps = null; try { FileOutputStream fos = new FileOutputStream(file); @@ -307,37 +359,49 @@ public class BackupUtils { } return ps; } - } + /** - /** - * Generate the text file to store imported data - */ - private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) { - StringBuilder sb = new StringBuilder(); - sb.append(Environment.getExternalStorageDirectory()); - sb.append(context.getString(filePathResId)); - File filedir = new File(sb.toString()); - sb.append(context.getString( - fileNameFormatResId, - DateFormat.format(context.getString(R.string.format_date_ymd), - System.currentTimeMillis()))); - File file = new File(sb.toString()); - - try { - if (!filedir.exists()) { - filedir.mkdir(); - } - if (!file.exists()) { - file.createNewFile(); + 生成存储导入数据的文本文件 + + @param context 上下文对象 + + @param filePathResId 文件路径的资源ID + + @param fileNameFormatResId 文件名格式的资源ID + + @return 生成的文本文件对象 + */ + private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) { + StringBuilder sb = new StringBuilder(); +// 获取外部存储卡目录并拼接上文件路径 + sb.append(Environment.getExternalStorageDirectory()); + sb.append(context.getString(filePathResId)); + File filedir = new File(sb.toString()); +// 拼接文件名及格式 + sb.append(context.getString( + fileNameFormatResId, + DateFormat.format(context.getString(R.string.format_date_ymd), + System.currentTimeMillis()))); + File file = new File(sb.toString()); + + try { +// 如果文件目录不存在则创建 + if (!filedir.exists()) { + filedir.mkdir(); + } +// 如果文件不存在则创建 + if (!file.exists()) { + file.createNewFile(); + } + return file; + } catch (SecurityException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); } - return file; - } catch (SecurityException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - return null; + return null; + } } } diff --git a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java index 2a14982..df473e9 100644 --- a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java +++ b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java @@ -37,6 +37,7 @@ import java.util.HashSet; public class DataUtils { public static final String TAG = "DataUtils"; + // 批量删除笔记 public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) { if (ids == null) { Log.d(TAG, "the ids is null"); @@ -49,7 +50,7 @@ public class DataUtils { ArrayList operationList = new ArrayList(); for (long id : ids) { - if(id == Notes.ID_ROOT_FOLDER) { + if(id == Notes.ID_ROOT_FOLDER) { // 避免删除系统文件夹根目录 Log.e(TAG, "Don't delete system folder root"); continue; } @@ -71,17 +72,35 @@ public class DataUtils { } return false; } +//1 + /** + 将笔记移动到指定文件夹中 + @param resolver ContentResolver对象，用于访问数据 + @param id 要移动的笔记的ID + @param srcFolderId 原文件夹的ID + @param desFolderId 目标文件夹的ID + */ public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) { ContentValues values = new ContentValues(); - values.put(NoteColumns.PARENT_ID, desFolderId); - values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId); - values.put(NoteColumns.LOCAL_MODIFIED, 1); - resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null); + values.put(NoteColumns.PARENT_ID, desFolderId); // 将笔记的父文件夹ID设置为目标文件夹ID + values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId); // 将笔记的原始父文件夹ID设置为原文件夹ID + values.put(NoteColumns.LOCAL_MODIFIED, 1); // 标记笔记已被修改 + resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null); // 更新笔记数据 } + /** + + 批量将笔记移动到指定文件夹中 + + @param resolver ContentResolver对象，用于访问数据 + + @param ids 要移动的笔记ID的HashSet集合 + + @param folderId 目标文件夹的ID - public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids, - long folderId) { + @return 是否移动成功 + */ + public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids, long folderId) { if (ids == null) { Log.d(TAG, "the ids is null"); return true; @@ -91,57 +110,79 @@ public class DataUtils { for (long id : ids) { ContentProviderOperation.Builder builder = ContentProviderOperation .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); - builder.withValue(NoteColumns.PARENT_ID, folderId); - builder.withValue(NoteColumns.LOCAL_MODIFIED, 1); - operationList.add(builder.build()); + builder.withValue(NoteColumns.PARENT_ID, folderId); // 将笔记的父文件夹ID设置为目标文件夹ID + builder.withValue(NoteColumns.LOCAL_MODIFIED, 1); // 标记笔记已被修改 + operationList.add(builder.build()); // 将操作添加到操作列表中 } try { - ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList); + ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList); // 批量执行操作 if (results == null || results.length == 0 || results[0] == null) { - Log.d(TAG, "delete notes failed, ids:" + ids.toString()); + Log.d(TAG, "delete notes failed, ids:" + ids.toString()); // 执行失败，打印日志 return false; } - return true; + return true; // 执行成功，返回true } catch (RemoteException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); + Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); // 打印异常日志 } catch (OperationApplicationException e) { - Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); + Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); // 打印异常日志 } - return false; + return false; // 执行失败，返回false } - +//2 /** * Get the all folder count except system folders {@link Notes#TYPE_SYSTEM}} */ - public static int getUserFolderCount(ContentResolver resolver) { - Cursor cursor =resolver.query(Notes.CONTENT_NOTE_URI, - new String[] { "COUNT(*)" }, - NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?", - new String[] { String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)}, - null); - int count = 0; - if(cursor != null) { - if(cursor.moveToFirst()) { - try { - count = cursor.getInt(0); - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, "get folder count failed:" + e.toString()); - } finally { - cursor.close(); - } - } - } - return count; - } + /**获取用户自定义文件夹的数量 + + @param resolver ContentResolver对象 + + @return 用户自定义文件夹的数量 + */ + public static int getUserFolderCount(ContentResolver resolver) { + Cursor cursor = resolver.query( + Notes.CONTENT_NOTE_URI, + new String[]{"COUNT()"}, + NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?", + new String[]{String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)}, + null + ); + + int count = 0; + if (cursor != null) { + if (cursor.moveToFirst()) { + try { + count = cursor.getInt(0); + } catch (IndexOutOfBoundsException e) { + Log.e(TAG, "get folder count failed:" + e.toString()); + } finally { + cursor.close(); + } + } + } + return count; + } + + /**判断指定类型的便签是否存在于便签数据库中 + + @param resolver ContentResolver对象 + + @param noteId 便签的ID + + @param type 便签的类型 + + @return 存在返回true，否则返回false + */ public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) { - Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), + Cursor cursor = resolver.query( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null, NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER, - new String [] {String.valueOf(type)}, - null); + new String[]{String.valueOf(type)}, + null + ); boolean exist = false; if (cursor != null) { @@ -152,7 +193,14 @@ public class DataUtils { } return exist; } - +//3 + /** + * 检查笔记是否存在于笔记数据库中 + * + * @param resolver ContentResolver对象 + * @param noteId 笔记ID + * @return 如果笔记存在于笔记数据库中，则返回true，否则返回false + */ public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) { Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null, null, null, null); @@ -167,6 +215,13 @@ public class DataUtils { return exist; } + /** + * 检查数据是否存在于数据数据库中 + * + * @param resolver ContentResolver对象 + * @param dataId 数据ID + * @return 如果数据存在于数据数据库中，则返回true，否则返回false + */ public static boolean existInDataDatabase(ContentResolver resolver, long dataId) { Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null, null, null, null); @@ -181,11 +236,18 @@ public class DataUtils { return exist; } + /** + * 检查指定名称的可见文件夹是否存在于笔记数据库中 + * + * @param resolver ContentResolver对象 + * @param name 文件夹名称 + * @return 如果存在，则返回true，否则返回false + */ public static boolean checkVisibleFolderName(ContentResolver resolver, String name) { Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null, NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + - " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + - " AND " + NoteColumns.SNIPPET + "=?", + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + + " AND " + NoteColumns.SNIPPET + "=?", new String[] { name }, null); boolean exist = false; if(cursor != null) { @@ -196,14 +258,15 @@ public class DataUtils { } return exist; } +//4 + // 获取文件夹内所有便签小部件信息的方法 public static HashSet getFolderNoteWidget(ContentResolver resolver, long folderId) { Cursor c = resolver.query(Notes.CONTENT_NOTE_URI, new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE }, NoteColumns.PARENT_ID + "=?", new String[] { String.valueOf(folderId) }, null); - HashSet set = null; if (c != null) { if (c.moveToFirst()) { @@ -224,13 +287,13 @@ public class DataUtils { return set; } + // 通过便签ID获取电话号码的方法 public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) { Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, new String [] { CallNote.PHONE_NUMBER }, CallNote.NOTE_ID + "=? AND " + CallNote.MIME_TYPE + "=?", new String [] { String.valueOf(noteId), CallNote.CONTENT_ITEM_TYPE }, null); - if (cursor != null && cursor.moveToFirst()) { try { return cursor.getString(0); @@ -242,29 +305,31 @@ public class DataUtils { } return ""; } +//5 +public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) { + // 根据电话号码和通话时间获取Note id + Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, + new String [] { CallNote.NOTE_ID }, + CallNote.CALL_DATE + "=? AND " + CallNote.MIME_TYPE + "=? AND PHONE_NUMBERS_EQUAL(" + + CallNote.PHONE_NUMBER + ",?)", + new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber }, + null); - public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) { - Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI, - new String [] { CallNote.NOTE_ID }, - CallNote.CALL_DATE + "=? AND " + CallNote.MIME_TYPE + "=? AND PHONE_NUMBERS_EQUAL(" - + CallNote.PHONE_NUMBER + ",?)", - new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber }, - null); - - if (cursor != null) { - if (cursor.moveToFirst()) { - try { - return cursor.getLong(0); - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, "Get call note id fails " + e.toString()); - } + if (cursor != null) { + if (cursor.moveToFirst()) { + try { + return cursor.getLong(0); + } catch (IndexOutOfBoundsException e) { + Log.e(TAG, "Get call note id fails " + e.toString()); } - cursor.close(); } - return 0; + cursor.close(); } + return 0; +} public static String getSnippetById(ContentResolver resolver, long noteId) { + // 根据Note id获取Note摘要 Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, new String [] { NoteColumns.SNIPPET }, NoteColumns.ID + "=?", @@ -283,6 +348,7 @@ public class DataUtils { } public static String getFormattedSnippet(String snippet) { + // 格式化Note摘要 if (snippet != null) { snippet = snippet.trim(); int index = snippet.indexOf('\n'); @@ -293,3 +359,4 @@ public class DataUtils { return snippet; } } + diff --git a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java index 1ad3ad6..2de1a4d 100644 --- a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java +++ b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java @@ -41,19 +41,19 @@ public class ResourceParser { public static class NoteBgResources { private final static int [] BG_EDIT_RESOURCES = new int [] { - R.drawable.edit_yellow, - R.drawable.edit_blue, - R.drawable.edit_white, - R.drawable.edit_green, - R.drawable.edit_red + R.drawable.edit_yellow, + R.drawable.edit_blue, + R.drawable.edit_white, + R.drawable.edit_green, + R.drawable.edit_red }; private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] { - R.drawable.edit_title_yellow, - R.drawable.edit_title_blue, - R.drawable.edit_title_white, - R.drawable.edit_title_green, - R.drawable.edit_title_red + R.drawable.edit_title_yellow, + R.drawable.edit_title_blue, + R.drawable.edit_title_white, + R.drawable.edit_title_green, + R.drawable.edit_title_red }; public static int getNoteBgResource(int id) { @@ -76,35 +76,35 @@ public class ResourceParser { public static class NoteItemBgResources { private final static int [] BG_FIRST_RESOURCES = new int [] { - R.drawable.list_yellow_up, - R.drawable.list_blue_up, - R.drawable.list_white_up, - R.drawable.list_green_up, - R.drawable.list_red_up + R.drawable.list_yellow_up, + R.drawable.list_blue_up, + R.drawable.list_white_up, + R.drawable.list_green_up, + R.drawable.list_red_up }; private final static int [] BG_NORMAL_RESOURCES = new int [] { - R.drawable.list_yellow_middle, - R.drawable.list_blue_middle, - R.drawable.list_white_middle, - R.drawable.list_green_middle, - R.drawable.list_red_middle + R.drawable.list_yellow_middle, + R.drawable.list_blue_middle, + R.drawable.list_white_middle, + R.drawable.list_green_middle, + R.drawable.list_red_middle }; private final static int [] BG_LAST_RESOURCES = new int [] { - R.drawable.list_yellow_down, - R.drawable.list_blue_down, - R.drawable.list_white_down, - R.drawable.list_green_down, - R.drawable.list_red_down, + R.drawable.list_yellow_down, + R.drawable.list_blue_down, + R.drawable.list_white_down, + R.drawable.list_green_down, + R.drawable.list_red_down, }; private final static int [] BG_SINGLE_RESOURCES = new int [] { - R.drawable.list_yellow_single, - R.drawable.list_blue_single, - R.drawable.list_white_single, - R.drawable.list_green_single, - R.drawable.list_red_single + R.drawable.list_yellow_single, + R.drawable.list_blue_single, + R.drawable.list_white_single, + R.drawable.list_green_single, + R.drawable.list_red_single }; public static int getNoteBgFirstRes(int id) { @@ -130,11 +130,11 @@ public class ResourceParser { public static class WidgetBgResources { private final static int [] BG_2X_RESOURCES = new int [] { - R.drawable.widget_2x_yellow, - R.drawable.widget_2x_blue, - R.drawable.widget_2x_white, - R.drawable.widget_2x_green, - R.drawable.widget_2x_red, + R.drawable.widget_2x_yellow, + R.drawable.widget_2x_blue, + R.drawable.widget_2x_white, + R.drawable.widget_2x_green, + R.drawable.widget_2x_red, }; public static int getWidget2xBgResource(int id) { @@ -142,11 +142,11 @@ public class ResourceParser { } private final static int [] BG_4X_RESOURCES = new int [] { - R.drawable.widget_4x_yellow, - R.drawable.widget_4x_blue, - R.drawable.widget_4x_white, - R.drawable.widget_4x_green, - R.drawable.widget_4x_red + R.drawable.widget_4x_yellow, + R.drawable.widget_4x_blue, + R.drawable.widget_4x_white, + R.drawable.widget_4x_green, + R.drawable.widget_4x_red }; public static int getWidget4xBgResource(int id) { @@ -156,10 +156,10 @@ public class ResourceParser { public static class TextAppearanceResources { private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] { - R.style.TextAppearanceNormal, - R.style.TextAppearanceMedium, - R.style.TextAppearanceLarge, - R.style.TextAppearanceSuper + R.style.TextAppearanceNormal, + R.style.TextAppearanceMedium, + R.style.TextAppearanceLarge, + R.style.TextAppearanceSuper }; public static int getTexAppearanceResource(int id) { diff --git a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java index 85723be..fc6a3ee 100644 --- a/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java +++ b/代码解读/MiNotes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package net.micode.notes.ui; import android.app.Activity; @@ -39,58 +23,81 @@ import net.micode.notes.tool.DataUtils; import java.io.IOException; - public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener { - private long mNoteId; - private String mSnippet; + private long mNoteId; //文本在数据库存储中的ID号 + private String mSnippet; //闹钟提示时出现的文本片段 private static final int SNIPPET_PREW_MAX_LEN = 60; MediaPlayer mPlayer; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + //Bundle类型的数据与Map类型的数据相似，都是以key-value的形式存储数据的 + //onsaveInstanceState方法是用来保存Activity的状态的 + //能从onCreate的参数savedInsanceState中获得状态数据 requestWindowFeature(Window.FEATURE_NO_TITLE); + //界面显示——无标题 final Window win = getWindow(); win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); if (!isScreenOn()) { win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON + //保持窗体点亮 | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON + //将窗体点亮 | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON + //允许窗体点亮时锁屏 | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR); - } + }//在手机锁屏后如果到了闹钟提示时间，点亮屏幕 Intent intent = getIntent(); try { mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId); + //根据ID从数据库中获取标签的内容； + //getContentResolver（）是实现数据共享，实例存储。 mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0, SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info) : mSnippet; + //判断标签片段是否达到符合长度 } catch (IllegalArgumentException e) { e.printStackTrace(); return; } - + /* + try + { + // 代码区 + } + catch(Exception e) + { + // 异常处理 + } + 代码区如果有错误，就会返回所写异常的处理。*/ mPlayer = new MediaPlayer(); if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) { showActionDialog(); + //弹出对话框 playAlarmSound(); + //闹钟提示音激发 } else { finish(); + //完成闹钟动作 } } private boolean isScreenOn() { + //判断屏幕是否锁屏，调用系统函数判断，最后返回值是布尔类型 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); return pm.isScreenOn(); } private void playAlarmSound() { + //闹钟提示音激发 Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); - + //调用系统的铃声管理URI，得到闹钟提示音 int silentModeStreams = Settings.System.getInt(getContentResolver(), Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); @@ -101,12 +108,19 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD } try { mPlayer.setDataSource(this, url); + //方法：setDataSource(Context context, Uri uri) + //解释：无返回值，设置多媒体数据来源【根据 Uri】 mPlayer.prepare(); + //准备同步 mPlayer.setLooping(true); + //设置是否循环播放 mPlayer.start(); + //开始播放 } catch (IllegalArgumentException e) { // TODO Auto-generated catch block e.printStackTrace(); + //e.printStackTrace()函数功能是抛出异常， 还将显示出更深的调用信息 + //System.out.println(e)，这个方法打印出异常，并且输出在哪里出现的异常 } catch (SecurityException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -121,38 +135,58 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD private void showActionDialog() { AlertDialog.Builder dialog = new AlertDialog.Builder(this); + //AlertDialog的构造方法全部是Protected的 + //所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。 + //要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法 + //如这里的dialog就是新建了一个AlertDialog dialog.setTitle(R.string.app_name); + //为对话框设置标题 dialog.setMessage(mSnippet); + //为对话框设置内容 dialog.setPositiveButton(R.string.notealert_ok, this); + //给对话框添加"Yes"按钮 if (isScreenOn()) { dialog.setNegativeButton(R.string.notealert_enter, this); - } + }//对话框添加"No"按钮 dialog.show().setOnDismissListener(this); } public void onClick(DialogInterface dialog, int which) { switch (which) { + //用which来选择click后下一步的操作 case DialogInterface.BUTTON_NEGATIVE: + //这是取消操作 Intent intent = new Intent(this, NoteEditActivity.class); + //实现两个类间的数据传输 intent.setAction(Intent.ACTION_VIEW); + //设置动作属性 intent.putExtra(Intent.EXTRA_UID, mNoteId); + //实现key-value对 + //EXTRA_UID为key；mNoteId为键 startActivity(intent); + //开始动作 break; default: + //这是确定操作 break; } } public void onDismiss(DialogInterface dialog) { + //忽略 stopAlarmSound(); + //停止闹钟声音 finish(); + //完成该动作 } private void stopAlarmSound() { if (mPlayer != null) { mPlayer.stop(); + //停止播放 mPlayer.release(); + //释放MediaPlayer对象 mPlayer = null; } } -} +} \ No newline at end of file diff --git a/代码解读/MiNotes-master/local.properties b/代码解读/MiNotes-master/local.properties index 95e6502..0d6b28d 100644 --- a/代码解读/MiNotes-master/local.properties +++ b/代码解读/MiNotes-master/local.properties @@ -4,10 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -<<<<<<< remotes/origin/c_master -#Sun Feb 26 10:45:39 CST 2023 -sdk.dir=D\:\\IDEA\\AndroidSDK -======= -#Wed Mar 08 14:25:18 CST 2023 +#Wed Mar 15 19:22:25 CST 2023 sdk.dir=E\:\\SDK ->>>>>>> local