diff --git a/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin index 661586c..87c1ad6 100644 Binary files a/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin and b/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock index 75da0b7..14526ee 100644 Binary files a/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock and b/src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin index 7578089..40de292 100644 Binary files a/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin and b/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock index 42cbd09..7373e78 100644 Binary files a/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock and b/src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index cde5fa6..f7f4ed3 100644 Binary files a/src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index b641143..cac300d 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master/.gradle/file-system.probe b/src/Notes-master/.gradle/file-system.probe index 07679b3..8bbcfbf 100644 Binary files a/src/Notes-master/.gradle/file-system.probe and b/src/Notes-master/.gradle/file-system.probe differ diff --git a/src/Notes-master/.idea/misc.xml b/src/Notes-master/.idea/misc.xml index ec46993..9ba2680 100644 --- a/src/Notes-master/.idea/misc.xml +++ b/src/Notes-master/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/src/Notes-master/.idea/sonarlint/issuestore/index.pb b/src/Notes-master/.idea/sonarlint/issuestore/index.pb index e506dda..d6899a4 100644 --- a/src/Notes-master/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes-master/.idea/sonarlint/issuestore/index.pb @@ -5,29 +5,39 @@ p @app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13 i 9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236 -b -2app/src/main/java/net/micode/notes/model/Note.java,d\d\dd970bd8ce083850fca1d4d159647ccd110e57cb P app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e B import-summary.txt,3\7\370b55b9ba807597d2aa123506d4091d242d570f -@ -local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca X (gradle/wrapper/gradle-wrapper.properties,f\b\fbe448ebfc3eb2d4e308f6b8b043666f5b57235e 7 gradlew,5\b\5bbfa66edb4db3c7c33c5181f43510990d3307f9 ; gradlew.bat,2\a\2a45a911a8f1836b0b6c5b758962572012d8f8c3 -< - build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 -@ -app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164 ? settings.gradle,0\5\05efc8b1657769a27696d478ded1e95f38737233 b 2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5 p @app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java,4\5\4529b3a97b0f3b19b895aa06f23bed63ff38a312 +f +6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56 +b +2app/src/main/java/net/micode/notes/model/Note.java,d\d\dd970bd8ce083850fca1d4d159647ccd110e57cb +m +=app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java,c\4\c42ad3cd6e664963fa1849c760a57d417d500ee7 +h +8app/src/main/java/net/micode/notes/tool/BackupUtils.java,a\4\a446c87b1013132f8adaf83656b582028e8809af +g +7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9 +k +;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c s -Capp/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java,0\2\023468cfdd0b71d4098903b9070e364658e2fbcf \ No newline at end of file +Capp/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java,0\2\023468cfdd0b71d4098903b9070e364658e2fbcf +@ +app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164 +< + build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 +@ +local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk index efa22e5..781dd94 100644 Binary files a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index a305f75..69400b3 100644 Binary files a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_0/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_0/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_1/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_1/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_2/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_2/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_3/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_3/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_4/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_4/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_5/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_5/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_6/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_6/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_6/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_7/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_7/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9539198292720b78a9066b3c055625e5b8a8aa4c51af92cd0eec9da5f19dbd05_bucket_7/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 422009f..a8d50d9 100644 Binary files a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 147689b..eceab5c 100644 Binary files a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 7178dcd..b88ca8a 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,5 +1,4 @@ -<<<<<<< HEAD -#Fri Oct 21 22:05:49 CST 2022 +#Tue Oct 25 23:35:42 CST 2022 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat @@ -15,8 +14,8 @@ net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\xiaomi_Note\\src\\Not net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat @@ -99,105 +98,3 @@ net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\xiaomi_Note\\src\ net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat net.micode.notes.app-main-7\:/layout/activity_delete_password.xml=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_delete_password.xml.flat -======= -#Sat Oct 22 08:48:55 CST 2022 -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/layout/activity_login.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/layout/activity_set_loginpassword.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_set_loginpassword.xml.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/layout/activity_change_password.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_change_password.xml.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/layout/activity_delete_password.xml=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_delete_password.xml.flat ->>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89 diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml index 0501512..a9f2676 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -54,6 +54,7 @@ 移动到文件夹 上一级文件夹 退出清单模式 + 朗读便签 删除提醒 搜索 全选 diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index 1734f7e..4417fb4 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -73,6 +73,7 @@ Move to folder Parent folder Leave check list + Read_note Delete reminder Search Select all diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 187b002..281e158 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,9 +1,5 @@ -<<<<<<< HEAD -======= - ->>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89 -%s --%s --%s @@ -11,19 +7,11 @@ Messaging Email -<<<<<<< HEAD - #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 randomLoginSettingdelete passwordDeleteCall 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 sizeSmallMediumLargeSuperRead_noteSelect fontEnter 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 randomLoginSettingdelete passwordDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancelcountallNotes" %1$s result for \"%2$s\" %1$s results for \"%2$s\" - Select font 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 - %1$s 条符合“%2$s”的搜索结果 - 选择字体 - 短信 - 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - 选择字体 -======= - - 短信 - 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大选择字体进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大朗读便签选择字体进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消便签数量 %1$s 条符合“%2$s”的搜索结果 - 便签数量 + 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大选择字体進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大朗讀便簽选择字体進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - ->>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89 + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index a28161c..47a4964 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 317b780..117a959 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 726a4de..5c5707c 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 6eeea47..bf70214 100644 --- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,9 +1,4 @@ -<<<<<<< HEAD -#Sun Oct 23 23:50:26 CST 2022 +#Tue Oct 25 23:37:02 CST 2022 base.0=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex -======= -#Sat Oct 22 08:49:05 CST 2022 -base.0=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex ->>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89 renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 22cd381..6a5e8d7 100644 Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index f373ebf..3e30c2f 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index 1606d91..0d94b05 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index be9b742..e2f8fff 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword.class index e83ac20..377154b 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 24c6ed1..743cdf8 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class index 3a00fbe..d8dcac2 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 54fec31..09dfc43 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index e92b56c..2f21353 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 9bfec56..8da9eab 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 9c93f2e..eda8872 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index e3045cc..801e7c1 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 1d9192a..f9311c8 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index dc2ca9b..e0addd3 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 3d6ff26..8ffbba0 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index f300266..678a5f6 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 41e3b16..a86f930 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index b6fd4fc..cfa0436 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 3ed6c99..f692648 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 27731b9..145e7cb 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 2cfbcc9..2daea39 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 26861a8..47efdf9 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 593b5fd..730251c 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword.class index a2d303f..1cd4a33 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index 77eb7a5..a3e6d35 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 4f02245..221cabf 100644 --- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -21,117 +21,117 @@ 21 22 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml +23-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml 24 android:targetSdkVersion="30" /> -24-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml +24-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml 25 26 -26-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:5-81 -26-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:22-78 +26-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:5-81 +26-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:22-78 27 -27-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-88 -27-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-85 +27-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-88 +27-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-85 28 -28-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-67 -28-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-64 +28-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-67 +28-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-64 29 -29-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-72 -29-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-69 +29-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-72 +29-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-69 30 -30-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-74 -30-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-71 +30-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-74 +30-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-71 31 -31-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-80 -31-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-77 +31-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-80 +31-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-77 32 -32-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-71 -32-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-68 +32-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-71 +32-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-68 33 -33-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-74 -33-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-71 +33-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-74 +33-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-71 34 -34-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-81 -34-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-78 +34-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-81 +34-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-78 35 36 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:34:5-210:19 +36-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:34:5-210:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:35:9-42 +38-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:35:9-42 39 android:label="@string/app_name" -39-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-41 +39-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-41 40 android:testOnly="true" > 41 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20 +41-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20 42 android:name="net.micode.notes.ui.LoginActivity" -42-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-45 +42-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-45 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 44 android:label="@string/app_name" -44-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 45 android:launchMode="singleTop" -45-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" -46-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 +46-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 47 android:windowSoftInputMode="adjustPan" > -47-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52 +47-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52 48 49 50 -50-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29 +50-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29 51 -51-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69 -51-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66 +51-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69 +51-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66 52 53 -53-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77 -53-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74 +53-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77 +53-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74 54 55 56 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-59:20 +56-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-59:20 57 android:name="net.micode.notes.ui.ChangingPassword" -57-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48 +57-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48 58 android:configChanges="keyboardHidden|orientation|screenSize" -58-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74 +58-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74 59 android:label="@string/app_name" -59-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-45 +59-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-45 60 android:launchMode="singleTop" -60-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 +60-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 61 android:theme="@style/NoteTheme" -61-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 +61-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 62 android:windowSoftInputMode="adjustPan" > -62-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-52 +62-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-52 63 64 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:61:9-68:20 +64-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:61:9-68:20 65 android:name="net.micode.notes.ui.SettingPassword" -65-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:62:13-47 +65-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:62:13-47 66 android:configChanges="keyboardHidden|orientation|screenSize" -66-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:63:13-74 +66-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:63:13-74 67 android:label="@string/app_name" -67-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:64:13-45 +67-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:64:13-45 68 android:launchMode="singleTop" -68-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-43 +68-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-43 69 android:theme="@style/NoteTheme" -69-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-45 +69-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-45 70 android:windowSoftInputMode="adjustPan" > -70-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:67:13-52 +70-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:67:13-52 71 72 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:70:9-77:20 +72-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:70:9-77:20 73 android:name="net.micode.notes.ui.DeletingPassword" -73-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:71:13-48 +73-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:71:13-48 74 android:configChanges="keyboardHidden|orientation|screenSize" -74-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-74 +74-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-74 75 android:label="@string/app_name" -75-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-45 +75-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-45 76 android:launchMode="singleTop" -76-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:74:13-43 +76-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:74:13-43 77 android:theme="@style/NoteTheme" -77-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:75:13-45 +77-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:75:13-45 78 android:windowSoftInputMode="adjustPan" > -78-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:76:13-52 +78-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:76:13-52 79 80 81 @@ -144,19 +144,19 @@ 88 89 90 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:90:9-102:20 +90-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:90:9-102:20 91 android:name="net.micode.notes.ui.NotesListActivity" -91-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-49 +91-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-49 92 android:configChanges="keyboardHidden|orientation|screenSize" -92-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:92:13-74 +92-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:92:13-74 93 android:label="@string/app_name" -93-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:93:13-45 +93-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:93:13-45 94 android:launchMode="singleTop" -94-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:94:13-43 +94-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:94:13-43 95 android:theme="@style/NoteTheme" -95-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:95:13-45 +95-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:95:13-45 96 android:windowSoftInputMode="adjustPan" > -96-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-52 +96-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-52 97 98 99 @@ -165,190 +165,190 @@ 102 103 104 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:104:9-136:20 +104-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:104:9-136:20 105 android:name="net.micode.notes.ui.NoteEditActivity" -105-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:105:13-48 +105-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:105:13-48 106 android:configChanges="keyboardHidden|orientation|screenSize" -106-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:106:13-74 +106-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:106:13-74 107 android:launchMode="singleTop" -107-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:107:13-43 +107-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:107:13-43 108 android:theme="@style/NoteTheme" > -108-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:108:13-45 +108-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:108:13-45 109 -109-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:110:13-115:29 +109-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:110:13-115:29 110 -110-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:17-79 -110-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:25-76 +110-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:17-79 +110-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:25-76 111 112 -112-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76 -112-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73 +112-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76 +112-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73 113 114 -114-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 -114-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 +114-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 +114-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 115 -115-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 -115-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 +115-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 +115-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 116 117 -117-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-120:29 +117-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-120:29 118 -118-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-71 -118-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-68 +118-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-71 +118-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-68 119 120 -120-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76 -120-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73 +120-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76 +120-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73 121 122 -122-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-127:29 +122-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-127:29 123 -123-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:17-69 -123-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:25-66 +123-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:17-69 +123-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:25-66 124 125 -125-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76 -125-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73 +125-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76 +125-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73 126 127 -127-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 -127-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 +127-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 +127-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 128 -128-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 -128-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 +128-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 +128-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 129 130 131 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-132:54 +131-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-132:54 132 android:name="android.app.searchable" -132-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:131:17-54 +132-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:131:17-54 133 android:resource="@xml/searchable" /> -133-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:132:17-51 +133-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:132:17-51 134 135 136 137 138 139 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:138:9-143:20 +139-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:138:9-143:20 140 android:name="net.micode.notes.data.NotesProvider" -140-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:139:13-63 +140-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:139:13-63 141 android:authorities="micode_notes" -141-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:140:13-47 +141-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:140:13-47 142 android:exported="false" -142-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-37 +142-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-37 143 android:multiprocess="true" > -143-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-40 +143-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-40 144 145 146 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-157:20 +146-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-157:20 147 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -147-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-57 +147-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-57 148 android:label="@string/app_widget2x2" > -148-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-50 +148-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-50 149 -149-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29 +149-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29 150 -150-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84 -150-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81 +150-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84 +150-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81 151 -151-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85 -151-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82 +151-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85 +151-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82 152 -152-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85 -152-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82 +152-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85 +152-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82 153 154 155 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58 +155-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58 156 android:name="android.appwidget.provider" -156-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58 +156-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58 157 android:resource="@xml/widget_2x_info" /> -157-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55 +157-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55 158 159 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:159:9-172:20 +159-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:159:9-172:20 160 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -160-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:160:13-57 +160-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:160:13-57 161 android:label="@string/app_widget4x4" > -161-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:161:13-50 +161-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:161:13-50 162 -162-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29 +162-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29 163 -163-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84 -163-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81 +163-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84 +163-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81 164 -164-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85 -164-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82 +164-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85 +164-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82 165 -165-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85 -165-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82 +165-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85 +165-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82 166 167 168 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58 +168-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58 169 android:name="android.appwidget.provider" -169-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58 +169-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58 170 android:resource="@xml/widget_4x_info" /> -170-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55 +170-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55 171 172 -172-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:9-178:20 -172-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:19-55 +172-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:9-178:20 +172-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:19-55 173 -173-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:175:13-177:29 +173-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:175:13-177:29 174 -174-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:17-79 -174-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:25-76 +174-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:17-79 +174-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:25-76 175 176 177 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:180:9-183:20 +177-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:180:9-183:20 178 android:name="net.micode.notes.ui.AlarmReceiver" -178-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:181:13-61 +178-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:181:13-61 179 android:process=":remote" > -179-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:182:13-38 +179-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:182:13-38 180 181 182 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:185:9-190:20 +182-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:185:9-190:20 183 android:name="net.micode.notes.ui.AlarmAlertActivity" -183-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:186:13-50 +183-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:186:13-50 184 android:label="@string/app_name" -184-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:187:13-45 +184-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:187:13-45 185 android:launchMode="singleInstance" -185-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:188:13-48 +185-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:188:13-48 186 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -186-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:189:13-75 +186-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:189:13-75 187 188 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:192:9-197:20 +188-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:192:9-197:20 189 android:name="net.micode.notes.ui.NotesPreferenceActivity" -189-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:193:13-71 +189-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:193:13-71 190 android:label="@string/preferences_title" -190-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:194:13-54 +190-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:194:13-54 191 android:launchMode="singleTop" -191-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:195:13-43 +191-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:195:13-43 192 android:theme="@android:style/Theme.Holo.Light" > -192-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:196:13-60 +192-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:196:13-60 193 194 195 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:199:9-202:19 +195-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:199:9-202:19 196 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -196-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:200:13-74 +196-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:200:13-74 197 android:exported="false" > -197-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:201:13-37 +197-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:201:13-37 198 199 200 D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:204:9-206:52 +200-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:204:9-206:52 201 android:name="android.app.default_searchable" -201-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:205:13-58 +201-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:205:13-58 202 android:value=".ui.NoteEditActivity" /> -202-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:206:13-49 +202-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:206:13-49 203