diff --git a/src/.gradle/7.5/checksums/checksums.lock b/src/.gradle/7.5/checksums/checksums.lock index 2f69dd3..552a29c 100644 Binary files a/src/.gradle/7.5/checksums/checksums.lock and b/src/.gradle/7.5/checksums/checksums.lock differ diff --git a/src/.gradle/7.5/checksums/md5-checksums.bin b/src/.gradle/7.5/checksums/md5-checksums.bin new file mode 100644 index 0000000..342247e Binary files /dev/null and b/src/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/src/.gradle/7.5/checksums/sha1-checksums.bin b/src/.gradle/7.5/checksums/sha1-checksums.bin new file mode 100644 index 0000000..7bed854 Binary files /dev/null and b/src/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/src/.gradle/7.5/executionHistory/executionHistory.bin b/src/.gradle/7.5/executionHistory/executionHistory.bin index 407974b..011d079 100644 Binary files a/src/.gradle/7.5/executionHistory/executionHistory.bin and b/src/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/7.5/executionHistory/executionHistory.lock b/src/.gradle/7.5/executionHistory/executionHistory.lock index 295e9a7..38990f8 100644 Binary files a/src/.gradle/7.5/executionHistory/executionHistory.lock and b/src/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/7.5/fileHashes/fileHashes.bin b/src/.gradle/7.5/fileHashes/fileHashes.bin index 36392fe..c046e96 100644 Binary files a/src/.gradle/7.5/fileHashes/fileHashes.bin and b/src/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/7.5/fileHashes/fileHashes.lock b/src/.gradle/7.5/fileHashes/fileHashes.lock index d733e74..129b084 100644 Binary files a/src/.gradle/7.5/fileHashes/fileHashes.lock and b/src/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin index 96095cc..10d6291 100644 Binary files a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index fcbf7d4..a26abdd 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/.gradle/buildOutputCleanup/outputFiles.bin b/src/.gradle/buildOutputCleanup/outputFiles.bin index ee7a886..624be9c 100644 Binary files a/src/.gradle/buildOutputCleanup/outputFiles.bin and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe index 0c5fffb..93873ad 100644 Binary files a/src/.gradle/file-system.probe and b/src/.gradle/file-system.probe differ diff --git a/src/.idea/deploymentTargetDropDown.xml b/src/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..64633d5 --- /dev/null +++ b/src/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml index 94a25f7..288b36b 100644 --- a/src/.idea/vcs.xml +++ b/src/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/src/app/build.gradle b/src/app/build.gradle index d832b52..6517ee4 100644 --- a/src/app/build.gradle +++ b/src/app/build.gradle @@ -23,7 +23,7 @@ android { } dependencies { - implementation fileTree(dir: 'D:\\Code\\Repository\\Android\\Notes2\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'], exclude: [], - excludes: ['commons-codec-1.11.jar','httpclient-4.5.14.jar','httpclient-cache-4.5.14.jar','httpmime-4.5.14.jar','fluent-hc-4.5.14.jar']) + implementation fileTree(dir: 'E:\\code\\Android\\mi-note\\src\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'], + exclude: ['commons-codec-1.11.jar','httpclient-4.5.14.jar','httpclient-cache-4.5.14.jar','httpmime-4.5.14.jar','fluent-hc-4.5.14.jar']) } diff --git a/src/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk index 05da9dd..786ab92 100644 Binary files a/src/app/build/intermediates/apk/debug/app-debug.apk and b/src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ea6a8dd9afda66a3ff8f8a82f7b7da26b848afc018a251d416b3de9e614dd3f1_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ea6a8dd9afda66a3ff8f8a82f7b7da26b848afc018a251d416b3de9e614dd3f1_bucket_0/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ea6a8dd9afda66a3ff8f8a82f7b7da26b848afc018a251d416b3de9e614dd3f1_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ea6a8dd9afda66a3ff8f8a82f7b7da26b848afc018a251d416b3de9e614dd3f1_bucket_1/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ea6a8dd9afda66a3ff8f8a82f7b7da26b848afc018a251d416b3de9e614dd3f1_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_0/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ea6a8dd9afda66a3ff8f8a82f7b7da26b848afc018a251d416b3de9e614dd3f1_bucket_2/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_0/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ea6a8dd9afda66a3ff8f8a82f7b7da26b848afc018a251d416b3de9e614dd3f1_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_1/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ea6a8dd9afda66a3ff8f8a82f7b7da26b848afc018a251d416b3de9e614dd3f1_bucket_3/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_1/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_2/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_3/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_4/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_4/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_4/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_5/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_5/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_5/graph.bin differ diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index ab4f76a..a3a1b1b 100644 Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/app/build/intermediates/dex_number_of_buckets_file/debug/out index bf0d87a..62f9457 100644 --- a/src/app/build/intermediates/dex_number_of_buckets_file/debug/out +++ b/src/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -1 +1 @@ -4 \ No newline at end of file +6 \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index 1a8e002..aef4a69 100644 Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5VoJUZYjh8a7uuHxa+e3fmH4yGQ= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5VoJUZYjh8a7uuHxa+e3fmH4yGQ= deleted file mode 100644 index 93a3b9f..0000000 Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5VoJUZYjh8a7uuHxa+e3fmH4yGQ= and /dev/null differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/91w5MTvp7O3_L_IidntsZS1oVCc= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/91w5MTvp7O3_L_IidntsZS1oVCc= deleted file mode 100644 index 66c75aa..0000000 Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/91w5MTvp7O3_L_IidntsZS1oVCc= and /dev/null differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AHbj_4BaZ7erXGLfWe7WqIzAQwc= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AHbj_4BaZ7erXGLfWe7WqIzAQwc= deleted file mode 100644 index 78e2058..0000000 Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AHbj_4BaZ7erXGLfWe7WqIzAQwc= and /dev/null differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FLg1U8_bANICTf973HXlrzTWbJ0= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FLg1U8_bANICTf973HXlrzTWbJ0= deleted file mode 100644 index 270124f..0000000 Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FLg1U8_bANICTf973HXlrzTWbJ0= and /dev/null differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F_HgUjaV6UZkHY+TPHuK_ZyiDU8= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F_HgUjaV6UZkHY+TPHuK_ZyiDU8= new file mode 100644 index 0000000..b69f917 Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F_HgUjaV6UZkHY+TPHuK_ZyiDU8= differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HtPFAJsgV6LS7hg+gg2P5ghM1uU= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HtPFAJsgV6LS7hg+gg2P5ghM1uU= new file mode 100644 index 0000000..2dca7d3 Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HtPFAJsgV6LS7hg+gg2P5ghM1uU= differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LVjZj2n1g+AwEhZnSBwyUktw85E= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LVjZj2n1g+AwEhZnSBwyUktw85E= new file mode 100644 index 0000000..86da686 Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LVjZj2n1g+AwEhZnSBwyUktw85E= differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RrOtNUaayCqXBGmQB32x8kVHZd8= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RrOtNUaayCqXBGmQB32x8kVHZd8= deleted file mode 100644 index aed581e..0000000 Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RrOtNUaayCqXBGmQB32x8kVHZd8= and /dev/null differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qTp+eSEYAfFSmjFIbtBuPXhxrgs= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qTp+eSEYAfFSmjFIbtBuPXhxrgs= new file mode 100644 index 0000000..02ce572 Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qTp+eSEYAfFSmjFIbtBuPXhxrgs= differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/siWS+FwfSriB9bO_JjE7vYjVDV8= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/siWS+FwfSriB9bO_JjE7vYjVDV8= new file mode 100644 index 0000000..bff786f Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/siWS+FwfSriB9bO_JjE7vYjVDV8= differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wKRCxGMjwYOFTqmIBhgFzsdFxKw= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wKRCxGMjwYOFTqmIBhgFzsdFxKw= new file mode 100644 index 0000000..208e210 Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wKRCxGMjwYOFTqmIBhgFzsdFxKw= differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/waeze5xxOXdr5Qlt_57SY2ZlUgI= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/waeze5xxOXdr5Qlt_57SY2ZlUgI= deleted file mode 100644 index aa34419..0000000 Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/waeze5xxOXdr5Qlt_57SY2ZlUgI= and /dev/null differ diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index a5f7b4e..6d7b615 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Wed Sep 13 13:32:45 CST 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +#Thu Sep 14 17:58:45 CST 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 6f4c9ec..1660f2e 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签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“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 8bdc6ef..faaf2d0 100644 --- a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index c8871d7..4554325 100644 --- a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index d45250e..14f9ed5 100644 --- a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 5a3abeb..a60c4c8 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Thu Sep 14 16:41:45 CST 2023 -base.0=D\:\\Code\\Repository\\Android\\Notes2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Thu Sep 14 18:02:40 CST 2023 +base.0=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 index a0005bf..5e55930 100644 Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index e2ad047..be46dec 100644 --- a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,274 +20,274 @@ 20 android:versionName="0.1" > 21 22 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:24:5-44 +22-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44 23 android:minSdkVersion="14" -23-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:24:15-41 +23-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:15-41 24 android:targetSdkVersion="33" /> -24-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:24:5-44 +24-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44 25 26 -26-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:26:5-81 -26-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:26:22-78 +26-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:26:5-81 +26-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:26:22-78 27 -27-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:27:5-88 -27-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:27:22-85 +27-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:27:5-88 +27-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:27:22-85 28 -28-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:28:5-67 -28-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:28:22-64 +28-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:28:5-67 +28-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:28:22-64 29 -29-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:29:5-72 -29-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:29:22-69 +29-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:29:5-72 +29-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:29:22-69 30 -30-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:30:5-74 -30-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:30:22-71 +30-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:30:5-74 +30-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:30:22-71 31 -31-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:31:5-80 -31-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:31:22-77 +31-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:31:5-80 +31-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:31:22-77 32 -32-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:32:5-71 -32-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:32:22-68 +32-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:32:5-71 +32-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:32:22-68 33 -33-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:33:5-74 -33-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:33:22-71 +33-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:33:5-74 +33-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:33:22-71 34 -34-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:34:5-81 -34-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:34:22-78 +34-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:34:5-81 +34-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:34:22-78 35 36 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:36:5-159:19 +36-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:36:5-159:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:37:9-42 +38-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:37:9-42 39 android:label="@string/app_name" -39-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:38:9-41 +39-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:38:9-41 40 android:testOnly="true" > 41 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:39:9-53:20 +41-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:39:9-53:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:41:13-49 +42-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:41:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:42:13-74 +43-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:42:13-74 44 android:exported="true" -44-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:40:13-36 +44-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:40:13-36 45 android:label="@string/app_name" -45-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:43:13-45 +45-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:43:13-45 46 android:launchMode="singleTop" -46-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:44:13-43 +46-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:44:13-43 47 android:theme="@style/NoteTheme" -47-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:45:13-45 +47-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:45:13-45 48 android:uiOptions="splitActionBarWhenNarrow" -48-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:46:13-57 +48-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:46:13-57 49 android:windowSoftInputMode="adjustPan" > -49-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:47:13-52 +49-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:47:13-52 50 -50-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:49:13-52:29 +50-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:49:13-52:29 51 -51-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:50:17-69 -51-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:50:25-66 +51-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:50:17-69 +51-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:50:25-66 52 53 -53-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:51:17-77 -53-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:51:27-74 +53-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:51:17-77 +53-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:51:27-74 54 55 56 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:55:9-85:20 +56-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:55:9-85:20 57 android:name="net.micode.notes.ui.NoteEditActivity" -57-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:57:13-48 +57-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:57:13-48 58 android:configChanges="keyboardHidden|orientation|screenSize" -58-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:58:13-74 +58-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:58:13-74 59 android:exported="true" -59-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:56:13-36 +59-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:56:13-36 60 android:launchMode="singleTop" -60-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:59:13-43 +60-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:59:13-43 61 android:theme="@style/NoteTheme" > -61-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:60:13-45 +61-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:60:13-45 62 -62-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:62:13-68:29 -62-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:62:28-49 +62-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:62:13-68:29 +62-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:62:28-49 63 -63-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:64:17-69 -63-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:64:25-66 +63-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:64:17-69 +63-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:64:25-66 64 65 -65-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:65:17-76 -65-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:65:27-73 +65-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:17-76 +65-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:27-73 66 67 -67-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:66:17-78 -67-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:66:23-75 +67-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:17-78 +67-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:23-75 68 -68-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:66:17-78 -68-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:66:23-75 +68-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:17-78 +68-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:23-75 69 70 -70-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:70:13-75:29 +70-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:70:13-75:29 71 -71-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:71:17-79 -71-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:71:25-76 +71-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:71:17-79 +71-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:71:25-76 72 73 -73-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:65:17-76 -73-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:65:27-73 +73-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:17-76 +73-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:27-73 74 75 -75-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:66:17-78 -75-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:66:23-75 +75-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:17-78 +75-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:23-75 76 -76-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:66:17-78 -76-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:66:23-75 +76-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:17-78 +76-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:23-75 77 78 -78-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:77:13-80:29 +78-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:77:13-80:29 79 -79-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:78:17-71 -79-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:78:25-68 +79-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:78:17-71 +79-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:78:25-68 80 81 -81-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:65:17-76 -81-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:65:27-73 +81-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:17-76 +81-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:27-73 82 83 84 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:82:13-84:54 +84-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:82:13-84:54 85 android:name="android.app.searchable" -85-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:83:17-54 +85-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:83:17-54 86 android:resource="@xml/searchable" /> -86-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:84:17-51 +86-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:84:17-51 87 88 89 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:87:9-91:43 +89-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:87:9-91:43 90 android:name="net.micode.notes.data.NotesProvider" -90-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:89:13-63 +90-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:89:13-63 91 android:authorities="micode_notes" -91-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:90:13-47 +91-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:90:13-47 92 android:exported="false" -92-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:88:13-37 +92-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:88:13-37 93 android:multiprocess="true" /> -93-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:91:13-40 +93-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:91:13-40 94 95 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:93:9-106:20 +95-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:93:9-106:20 96 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -96-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:95:13-57 +96-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:95:13-57 97 android:exported="false" -97-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:94:13-37 +97-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:94:13-37 98 android:label="@string/app_widget2x2" > -98-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:96:13-50 +98-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:96:13-50 99 -99-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:97:13-101:29 +99-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:97:13-101:29 100 -100-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:98:17-84 -100-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:98:25-81 +100-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:17-84 +100-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:25-81 101 -101-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:99:17-85 -101-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:99:25-82 +101-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:17-85 +101-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:25-82 102 -102-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:100:17-85 -102-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:100:25-82 +102-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:17-85 +102-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:25-82 103 104 105 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:103:13-105:58 +105-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:103:13-105:58 106 android:name="android.appwidget.provider" -106-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:104:17-58 +106-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:104:17-58 107 android:resource="@xml/widget_2x_info" /> -107-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:105:17-55 +107-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:105:17-55 108 109 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:107:9-121:20 +109-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:107:9-121:20 110 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -110-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:109:13-57 +110-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:109:13-57 111 android:exported="true" -111-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:108:13-36 +111-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:108:13-36 112 android:label="@string/app_widget4x4" > -112-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:110:13-50 +112-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:110:13-50 113 -113-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:97:13-101:29 +113-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:97:13-101:29 114 -114-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:98:17-84 -114-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:98:25-81 +114-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:17-84 +114-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:25-81 115 -115-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:99:17-85 -115-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:99:25-82 +115-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:17-85 +115-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:25-82 116 -116-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:100:17-85 -116-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:100:25-82 +116-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:17-85 +116-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:25-82 117 118 119 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:103:13-105:58 +119-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:103:13-105:58 120 android:name="android.appwidget.provider" -120-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:104:17-58 +120-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:104:17-58 121 android:resource="@xml/widget_4x_info" /> -121-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:105:17-55 +121-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:105:17-55 122 123 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:123:9-127:20 +123-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:9-127:20 124 android:name="net.micode.notes.ui.AlarmInitReceiver" -124-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:123:19-55 +124-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:19-55 125 android:exported="false" > -125-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:123:56-80 +125-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:56-80 126 -126-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:124:13-126:29 +126-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:124:13-126:29 127 -127-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:125:17-79 -127-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:125:25-76 +127-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:125:17-79 +127-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:125:25-76 128 129 130 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:129:9-133:20 +130-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:129:9-133:20 131 android:name="net.micode.notes.ui.AlarmReceiver" -131-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:131:13-61 +131-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:131:13-61 132 android:exported="false" -132-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:130:13-37 +132-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:130:13-37 133 android:process=":remote" > -133-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:132:13-38 +133-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:132:13-38 134 135 136 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:135:9-141:20 +136-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:135:9-141:20 137 android:name="net.micode.notes.ui.AlarmAlertActivity" -137-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:137:13-50 +137-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:137:13-50 138 android:exported="false" -138-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:136:13-37 +138-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:136:13-37 139 android:label="@string/app_name" -139-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:138:13-45 +139-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:138:13-45 140 android:launchMode="singleInstance" -140-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:139:13-48 +140-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:139:13-48 141 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -141-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:140:13-75 +141-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:140:13-75 142 143 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:143:9-149:20 +143-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:143:9-149:20 144 android:name="net.micode.notes.ui.NotesPreferenceActivity" -144-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:145:13-71 +144-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:145:13-71 145 android:exported="false" -145-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:144:13-37 +145-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:144:13-37 146 android:label="@string/preferences_title" -146-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:146:13-54 +146-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:146:13-54 147 android:launchMode="singleTop" -147-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:147:13-43 +147-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:147:13-43 148 android:theme="@android:style/Theme.Holo.Light" > -148-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:148:13-60 +148-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:148:13-60 149 150 151 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:151:9-154:19 +151-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:151:9-154:19 152 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -152-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:152:13-74 +152-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:152:13-74 153 android:exported="false" > -153-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:153:13-37 +153-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:153:13-37 154 155 156 D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:156:9-158:52 +156-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:156:9-158:52 157 android:name="android.app.default_searchable" -157-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:157:13-58 +157-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:157:13-58 158 android:value=".ui.NoteEditActivity" /> -158-->D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:158:13-49 +158-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:158:13-49 159 160 161 diff --git a/src/app/build/intermediates/merged_java_res/debug/base.jar b/src/app/build/intermediates/merged_java_res/debug/base.jar index eaa4af7..59a4a7c 100644 Binary files a/src/app/build/intermediates/merged_java_res/debug/base.jar and b/src/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index a86e3d6..eddffdf 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\Code\\Repository\\Android\\Notes2\\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": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "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": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "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": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,6 +21,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "E:\\code\\Android\\mi-note\\src\\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": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "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": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "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" + } } ] }, @@ -47,26 +47,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { - "source": "D:\\Code\\Repository\\Android\\Notes2\\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", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,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", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values\\dimens.xml", + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -83,7 +64,24 @@ } }, { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values\\arrays.xml", + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", @@ -102,7 +100,7 @@ } }, { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values\\styles.xml", + "source": "E:\\code\\Android\\mi-note\\src\\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", @@ -121,20 +119,22 @@ } }, { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values\\colors.xml", + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" + "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", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "132,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", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" }, "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" } } ] @@ -143,7 +143,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "E:\\code\\Android\\mi-note\\src\\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", @@ -162,7 +162,7 @@ } }, { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 7d50ec2..5040794 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\Code\\Repository\\Android\\Notes2\\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": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "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": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "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": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,6 +21,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "E:\\code\\Android\\mi-note\\src\\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": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "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": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "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/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 2a15d11..293566a 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 6fb1f72..e0b1e34 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\Code\\Repository\\Android\\Notes2\\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", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,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", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values\\dimens.xml", + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -40,7 +21,24 @@ } }, { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values\\arrays.xml", + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", @@ -59,7 +57,7 @@ } }, { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values\\styles.xml", + "source": "E:\\code\\Android\\mi-note\\src\\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", @@ -78,20 +76,22 @@ } }, { - "source": "D:\\Code\\Repository\\Android\\Notes2\\app\\src\\main\\res\\values\\colors.xml", + "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" + "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", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "132,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", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" }, "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" } } ] diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar b/src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar similarity index 100% rename from src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar rename to src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar diff --git a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt index 176e837..8de0cee 100644 --- a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\Code\Repository\Android\Notes2\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\Code\Repository\Android\Notes2\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\Code\Repository\Android\Notes2\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\Code\Repository\Android\Notes2\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\Code\Repository\Android\Notes2\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\Code\Repository\Android\Notes2\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\Code\Repository\Android\Notes2\app\src\debug\res -net.micode.notes.app-main-7 D:\Code\Repository\Android\Notes2\app\src\main\res +net.micode.notes.app-pngs-0 E:\code\Android\mi-note\src\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 E:\code\Android\mi-note\src\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 E:\code\Android\mi-note\src\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 E:\code\Android\mi-note\src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 E:\code\Android\mi-note\src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 E:\code\Android\mi-note\src\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 E:\code\Android\mi-note\src\app\src\debug\res +net.micode.notes.app-main-7 E:\code\Android\mi-note\src\app\src\main\res diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt index 32cc1b2..8e35cd5 100644 --- a/src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,259 +1,259 @@ -- Merging decision tree log --- manifest -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:18:1-160:12 -INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:18:1-160:12 -INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:18:1-160:12 -INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:18:1-160:12 -INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:18:1-160:12 -INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:18:1-160:12 -INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:18:1-160:12 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 package - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:20:5-31 - INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml - INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:20:5-31 + INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml + INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:22:5-30 - INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml - INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:22:5-30 + INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml + INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml xmlns:tools - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:19:5-51 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:19:5-51 xmlns:android - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:21:5-28 - INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml - INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:21:5-28 + INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml + INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:24:5-44 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44 android:targetSdkVersion - INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:24:5-44 - INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml + INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44 + INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:24:15-41 - INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml - INJECTED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:15-41 + INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml + INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:26:5-81 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:26:5-81 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:26:22-78 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:26:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:27:5-88 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:27:5-88 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:27:22-85 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:27:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:28:5-67 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:28:5-67 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:28:22-64 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:28:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:29:5-72 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:29:5-72 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:29:22-69 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:29:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:30:5-74 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:30:5-74 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:30:22-71 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:30:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:31:5-80 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:31:5-80 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:31:22-77 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:31:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:32:5-71 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:32:5-71 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:32:22-68 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:32:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:33:5-74 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:33:5-74 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:33:22-71 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:33:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:34:5-81 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:34:5-81 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:34:22-78 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:34:22-78 application -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:36:5-159:19 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:36:5-159:19 android:label - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:38:9-41 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:38:9-41 android:icon - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:37:9-42 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:37:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:39:9-53:20 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:39:9-53:20 android:label - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:43:13-45 android:launchMode - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:44:13-43 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:44:13-43 android:windowSoftInputMode - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:47:13-52 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:47:13-52 android:exported - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:40:13-36 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:40:13-36 android:uiOptions - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:46:13-57 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:46:13-57 android:configChanges - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:42:13-74 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:42:13-74 android:theme - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:45:13-45 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:45:13-45 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:41:13-49 + ADDED from E:\code\Android\mi-note\src\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:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:49:13-52:29 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:49:13-52:29 action#android.intent.action.MAIN -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:50:17-69 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:50:17-69 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:50:25-66 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:50:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:51:17-77 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:51:17-77 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:51:27-74 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:51:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:55:9-85:20 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:55:9-85:20 android:launchMode - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:59:13-43 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:59:13-43 android:exported - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:56:13-36 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:56:13-36 android:configChanges - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:58:13-74 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:58:13-74 android:theme - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:60:13-45 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:60:13-45 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:57:13-48 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:57: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:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:62:13-68:29 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:62:13-68:29 android:scheme - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:62:28-49 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:62:28-49 tools:ignore - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:63:17-47 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:63:17-47 action#android.intent.action.VIEW -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:64:17-69 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:64:17-69 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:64:25-66 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:64:25-66 category#android.intent.category.DEFAULT -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:65:17-76 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:17-76 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:65:27-73 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:27-73 data -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:66:17-78 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:17-78 android:mimeType - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:66:23-75 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:70:13-75:29 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:70:13-75:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:71:17-79 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:71:17-79 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:71:25-76 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:71:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:77:13-80:29 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:77:13-80:29 action#android.intent.action.SEARCH -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:78:17-71 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:78:17-71 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:78:25-68 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:78:25-68 meta-data#android.app.searchable -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:82:13-84:54 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:82:13-84:54 android:resource - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:84:17-51 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:84:17-51 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:83:17-54 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:83:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:87:9-91:43 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:87:9-91:43 android:authorities - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:90:13-47 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:90:13-47 android:multiprocess - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:91:13-40 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:91:13-40 android:exported - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:88:13-37 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:88:13-37 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:89:13-63 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:89:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:93:9-106:20 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:93:9-106:20 android:label - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:96:13-50 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:96:13-50 android:exported - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:94:13-37 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:94:13-37 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:95:13-57 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:95: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:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:97:13-101:29 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:97:13-101:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:98:17-84 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:17-84 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:98:25-81 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:99:17-85 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:17-85 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:99:25-82 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:100:17-85 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:17-85 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:100:25-82 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:25-82 meta-data#android.appwidget.provider -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:103:13-105:58 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:103:13-105:58 android:resource - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:105:17-55 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:105:17-55 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:104:17-58 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:104:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:107:9-121:20 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:107:9-121:20 android:label - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:110:13-50 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:110:13-50 android:exported - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:108:13-36 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:108:13-36 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:109:13-57 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:109:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:123:9-127:20 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:9-127:20 android:exported - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:123:56-80 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:56-80 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:123:19-55 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:124:13-126:29 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:124:13-126:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:125:17-79 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:125:17-79 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:125:25-76 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:125:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:129:9-133:20 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:129:9-133:20 android:process - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:132:13-38 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:132:13-38 android:exported - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:130:13-37 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:130:13-37 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:131:13-61 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:131:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:135:9-141:20 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:135:9-141:20 android:label - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:138:13-45 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:138:13-45 android:launchMode - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:139:13-48 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:139:13-48 android:exported - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:136:13-37 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:136:13-37 android:theme - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:140:13-75 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:140:13-75 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:137:13-50 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:137:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:143:9-149:20 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:143:9-149:20 android:label - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:146:13-54 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:146:13-54 android:launchMode - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:147:13-43 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:147:13-43 android:exported - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:144:13-37 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:144:13-37 android:theme - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:148:13-60 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:148:13-60 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:145:13-71 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:145:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:151:9-154:19 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:151:9-154:19 android:exported - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:153:13-37 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:153:13-37 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:152:13-74 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:152:13-74 meta-data#android.app.default_searchable -ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:156:9-158:52 +ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:156:9-158:52 android:value - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:158:13-49 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:158:13-49 android:name - ADDED from D:\Code\Repository\Android\Notes2\app\src\main\AndroidManifest.xml:157:13-58 + ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:157:13-58 diff --git a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index fb6dbc7..67a36ee 100644 Binary files a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/local.properties b/src/local.properties index 74359ea..c6f5e1a 100644 --- a/src/local.properties +++ b/src/local.properties @@ -2,6 +2,7 @@ # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. -# -#Wed Sep 13 13:31:52 CST 2023 -sdk.dir=D\:\\Code\\CodeTools\\IDE\\Android\\AndroidSDK +# For customization when using a Version Control System, please read the +# header note. +#Thu Sep 14 17:55:12 CST 2023 +sdk.dir=E\:\\sdk