From 92e573b08c845355aafd65702e5c9aaf1104d343 Mon Sep 17 00:00:00 2001 From: ZYP <1721777650@qq.com> Date: Mon, 4 Dec 2023 10:07:16 +0800 Subject: [PATCH] test --- .idea/vcs.xml | 6 + .../graph.bin | Bin 0 -> 235 bytes .../graph.bin | Bin 0 -> 235 bytes .../graph.bin | Bin 0 -> 235 bytes .../graph.bin | Bin 0 -> 235 bytes .../compile-file-map.properties | 99 +++++++ .../debug/mergeDebugResources/merger.xml | 28 +- .../compile-file-map.properties | 99 +++++++ .../debug/packageDebugResources/merger.xml | 28 +- .../incremental/mergeDebugAssets/merger.xml | 6 +- .../mergeDebugJniLibFolders/merger.xml | 6 +- .../incremental/mergeDebugShaders/merger.xml | 6 +- .../tmp/debug/dex-renamer-state.txt | 5 + .../manifest-merger-blame-debug-report.txt | 251 ++++++++++++++++++ .../debug/out/multi-v2/debug.json | 85 ++++++ .../debug/out/multi-v2/values-zh-rCN.json | 8 + .../debug/out/multi-v2/values-zh-rTW.json | 26 ++ .../debug/out/multi-v2/values.json | 51 ++++ .../source_set_path_map/debug/file-map.txt | 10 + .../logs/manifest-merger-debug-report.txt | 228 ++++++++++++++++ res/values/styles.xml | 4 +- 21 files changed, 939 insertions(+), 7 deletions(-) create mode 100644 .idea/vcs.xml create mode 100644 app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_0/graph.bin create mode 100644 app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_1/graph.bin create mode 100644 app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_2/graph.bin create mode 100644 app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_3/graph.bin diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_0/graph.bin new file mode 100644 index 0000000000000000000000000000000000000000..601f245f575611e9ee7dd20b1adfb34054ece53a GIT binary patch literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J literal 0 HcmV?d00001 diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_1/graph.bin new file mode 100644 index 0000000000000000000000000000000000000000..601f245f575611e9ee7dd20b1adfb34054ece53a GIT binary patch literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J literal 0 HcmV?d00001 diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_2/graph.bin new file mode 100644 index 0000000000000000000000000000000000000000..601f245f575611e9ee7dd20b1adfb34054ece53a GIT binary patch literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J literal 0 HcmV?d00001 diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_3/graph.bin new file mode 100644 index 0000000000000000000000000000000000000000..601f245f575611e9ee7dd20b1adfb34054ece53a GIT binary patch literal 235 zcmZ4UmVvdnh`}&9KUXg?FQq6yGes|{G&3h9wMZ`|wIVYwUC+0)Brz!`)g`qcH7_MK zFS*jaD6t@e0RkAA7#MvRcvGN~CB?pp1tkppK3R!niTb4_nK}AE0qcqapdI2MF+Gr& zo=;|8c4~@8VsQpg*5rU+j6lwT-$0Y17`PLYlT(X}{fmGOs3>9(MCgI4W@W#1@UU3I wMP>#jHwLbp{KOQu#N?9vB2Na+l8mC%;*9*9l!^j-2Z-~^Ie@ePh+V+|087D2XaE2J literal 0 HcmV?d00001 diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index f4bb44d..ecb7838 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,3 +1,4 @@ +<<<<<<< HEAD #Mon Nov 06 16:33:39 CST 2023 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat @@ -94,3 +95,101 @@ net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\software gongcheng\\Notes net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +======= +#Thu Nov 09 15:42:52 CST 2023 +net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-6\:/drawable/new_note.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-6\:/layout/add_account_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-6\:/layout/datetime_picker.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-6\:/layout/folder_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-6\:/layout/note_list_footer.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-6\:/layout/settings_header.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-6\:/layout/widget_2x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-6\:/layout/widget_4x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-6\:/menu/call_note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-6\:/menu/call_record_folder.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-6\:/menu/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-6\:/menu/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-6\:/menu/note_list_options.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-6\:/menu/sub_folder.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-6\:/raw/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +>>>>>>> develop diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 0a5cda5..0a7a21b 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,9 @@ +<<<<<<< HEAD +======= + +>>>>>>> develop -%s --%s --%s @@ -7,11 +11,19 @@ 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 randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" 短信 邮件 @@ -53,4 +66,17 @@ 郵件 便簽便簽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 + +======= + + 短信 + 邮件 + 便签便签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“的搜尋結果 + +>>>>>>> develop diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index d21bee4..5adea77 100644 --- a/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,3 +1,4 @@ +<<<<<<< HEAD #Mon Nov 06 16:33:42 CST 2023 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml @@ -94,3 +95,101 @@ net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\software gongcheng\\Notes net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml +======= +#Thu Nov 09 15:42:54 CST 2023 +net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml +net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml +net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png +net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png +net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png +net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png +net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png +net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png +net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png +net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png +net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png +net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png +net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml +net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml +net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml +net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml +net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml +net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml +net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml +net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml +net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml +net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml +net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml +net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml +net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml +net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml +net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml +net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml +net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml +net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml +net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml +net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml +net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml +net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml +net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction +net.micode.notes.app-main-5\:/raw/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction +net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml +net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml +net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml +net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml +>>>>>>> develop diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml index 0a5cda5..0a7a21b 100644 --- a/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -1,5 +1,9 @@ +<<<<<<< HEAD +======= + +>>>>>>> develop -%s --%s --%s @@ -7,11 +11,19 @@ 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 randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" 短信 邮件 @@ -53,4 +66,17 @@ 郵件 便簽便簽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 + +======= + + 短信 + 邮件 + 便签便签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“的搜尋結果 + +>>>>>>> develop diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index f4ef32a..f743738 100644 --- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,6 @@ - \ No newline at end of file +<<<<<<< HEAD + +======= + +>>>>>>> develop diff --git a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index b4d5d02..5a4d10a 100644 --- a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,6 @@ - \ No newline at end of file +<<<<<<< HEAD + +======= + +>>>>>>> develop diff --git a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index cf074fd..be898d0 100644 --- a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,6 @@ - \ No newline at end of file +<<<<<<< HEAD + +======= + +>>>>>>> develop diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index c5ad601..410e0ef 100644 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,9 @@ +<<<<<<< HEAD #Mon Nov 06 21:35:53 CST 2023 base.0=D\:\\software gongcheng\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +======= +#Thu Nov 09 15:43:06 CST 2023 +base.0=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +>>>>>>> develop path.0=classes.dex renamed.0=classes.dex diff --git a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index eceeaf7..eb009a7 100644 --- a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,6 +20,7 @@ 20 android:versionName="0.1" > 21 22 D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="14" 23-->D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 @@ -268,6 +269,256 @@ 148-->D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 149 android:value=".ui.NoteEditActivity" /> 149-->D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 +======= +22-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +23 android:minSdkVersion="14" +23-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 +24 android:targetSdkVersion="14" /> +25 +26 +26-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 +27 +27-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 +28 +28-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 +29 +29-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 +30 +30-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 +31 +31-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 +32 +32-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 +33 +33-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 +34 +34-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 +35 +36 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 +37 android:debuggable="true" +38 android:extractNativeLibs="true" +39 android:icon="@drawable/icon_app" +39-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 +40 android:label="@string/app_name" +40-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 +41 android:testOnly="true" > +42 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 +43 android:name="net.micode.notes.ui.NotesListActivity" +43-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 +44 android:configChanges="keyboardHidden|orientation|screenSize" +44-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 +45 android:label="@string/app_name" +45-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 +46 android:launchMode="singleTop" +46-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 +47 android:theme="@style/NoteTheme" +47-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 +48 android:uiOptions="splitActionBarWhenNarrow" +48-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 +49 android:windowSoftInputMode="adjustPan" > +49-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 +50 +50-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 +51 +51-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 +51-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 +52 +53 +53-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 +53-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 +54 +55 +56 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 +57 android:name="net.micode.notes.ui.NoteEditActivity" +57-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 +58 android:configChanges="keyboardHidden|orientation|screenSize" +58-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 +59 android:launchMode="singleTop" +59-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 +60 android:theme="@style/NoteTheme" > +60-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 +61 +61-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 +62 +62-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 +62-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 +63 +64 +64-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +64-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +65 +66 +66-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +67 +67-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +67-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +68 +69 +69-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 +70 +70-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 +70-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 +71 +72 +72-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +72-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +73 +74 +74-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +75 +75-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +75-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +76 +77 +77-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 +78 +78-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 +78-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 +79 +80 +80-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +80-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +81 +82 +83 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 +84 android:name="android.app.searchable" +84-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 +85 android:resource="@xml/searchable" /> +85-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 +86 +87 +88 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 +89 android:name="net.micode.notes.data.NotesProvider" +89-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 +90 android:authorities="micode_notes" +90-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 +91 android:multiprocess="true" /> +91-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 +92 +93 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 +94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +94-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 +95 android:label="@string/app_widget2x2" > +95-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 +96 +96-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +97 +97-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 +97-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +98 +98-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +98-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +99 +99-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +99-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +100 +101 +102 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +103 android:name="android.appwidget.provider" +103-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +104 android:resource="@xml/widget_2x_info" /> +104-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 +105 +106 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 +107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +107-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 +108 android:label="@string/app_widget4x4" > +108-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 +109 +109-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +110 +110-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 +110-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +111 +111-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +111-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +112 +112-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +112-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +113 +114 +115 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +116 android:name="android.appwidget.provider" +116-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +117 android:resource="@xml/widget_4x_info" /> +117-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 +118 +119 +119-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 +119-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 +120 +120-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 +121 +121-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 +121-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 +122 +123 +124 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 +125 android:name="net.micode.notes.ui.AlarmReceiver" +125-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 +126 android:process=":remote" > +126-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 +127 +128 +129 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 +130 android:name="net.micode.notes.ui.AlarmAlertActivity" +130-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 +131 android:label="@string/app_name" +131-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 +132 android:launchMode="singleInstance" +132-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 +133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +133-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 +134 +135 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 +136 android:name="net.micode.notes.ui.NotesPreferenceActivity" +136-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 +137 android:label="@string/preferences_title" +137-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 +138 android:launchMode="singleTop" +138-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 +139 android:theme="@android:style/Theme.Holo.Light" > +139-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 +140 +141 +142 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 +143 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +143-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 +144 android:exported="false" > +144-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 +145 +146 +147 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 +148 android:name="android.app.default_searchable" +148-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 +149 android:value=".ui.NoteEditActivity" /> +149-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 +>>>>>>> develop 150 151 152 diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index f35bd92..4944efd 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -4,7 +4,11 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", +======= + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", +>>>>>>> develop "from": { "startLines": "18", "startColumns": "4", @@ -23,7 +27,11 @@ } }, { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", +======= + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", +>>>>>>> develop "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", @@ -47,7 +55,47 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", "map": [ { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", +======= + "source": "D:\\GITwork\\Notes-master\\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", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + }, + { + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", +>>>>>>> develop "from": { "startLines": "19,26", "startColumns": "4,4", @@ -66,7 +114,11 @@ } }, { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", +======= + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", +>>>>>>> develop "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", @@ -85,7 +137,11 @@ } }, { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", +======= + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", +>>>>>>> develop "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -100,6 +156,7 @@ "endColumns": "51,52,52,51,51", "endOffsets": "524,577,630,682,734" } +<<<<<<< HEAD }, { "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", @@ -136,6 +193,8 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } +======= +>>>>>>> develop } ] }, @@ -143,6 +202,7 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", @@ -163,6 +223,9 @@ }, { "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", +======= + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", +>>>>>>> develop "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", @@ -179,6 +242,28 @@ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" } +<<<<<<< HEAD +======= + }, + { + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } +>>>>>>> develop } ] } diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index b086836..aa5acad 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,7 +4,11 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml", "map": [ { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", +======= + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", +>>>>>>> develop "from": { "startLines": "18", "startColumns": "4", @@ -23,7 +27,11 @@ } }, { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", +======= + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", +>>>>>>> develop "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", diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 8f19ff1..472194e 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,6 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml", "map": [ { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", @@ -24,6 +25,9 @@ }, { "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", +======= + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", +>>>>>>> develop "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", @@ -40,6 +44,28 @@ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" } +<<<<<<< HEAD +======= + }, + { + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } +>>>>>>> develop } ] } diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 69028fd..dd933fe 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,7 +4,47 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", "map": [ { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", +======= + "source": "D:\\GITwork\\Notes-master\\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", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + }, + { + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", +>>>>>>> develop "from": { "startLines": "19,26", "startColumns": "4,4", @@ -23,7 +63,11 @@ } }, { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", +======= + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", +>>>>>>> develop "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", @@ -42,7 +86,11 @@ } }, { +<<<<<<< HEAD "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", +======= + "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", +>>>>>>> develop "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -57,6 +105,7 @@ "endColumns": "51,52,52,51,51", "endOffsets": "524,577,630,682,734" } +<<<<<<< HEAD }, { "source": "D:\\software gongcheng\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", @@ -93,6 +142,8 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } +======= +>>>>>>> develop } ] } diff --git a/app/build/intermediates/source_set_path_map/debug/file-map.txt b/app/build/intermediates/source_set_path_map/debug/file-map.txt index 11afb98..7df31c8 100644 --- a/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,3 +1,4 @@ +<<<<<<< HEAD net.micode.notes.app-pngs-0 D:\software gongcheng\Notes-master\app\build\generated\res\pngs\debug net.micode.notes.app-resValues-1 D:\software gongcheng\Notes-master\app\build\generated\res\resValues\debug net.micode.notes.app-packageDebugResources-2 D:\software gongcheng\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir @@ -5,3 +6,12 @@ net.micode.notes.app-packageDebugResources-3 D:\software gongcheng\Notes-master\ net.micode.notes.app-merged_res-4 D:\software gongcheng\Notes-master\app\build\intermediates\merged_res\debug net.micode.notes.app-debug-5 D:\software gongcheng\Notes-master\app\src\debug\res net.micode.notes.app-main-6 D:\software gongcheng\Notes-master\app\src\main\res +======= +net.micode.notes.app-pngs-0 D:\GITwork\Notes-master\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\GITwork\Notes-master\app\build\generated\res\resValues\debug +net.micode.notes.app-packageDebugResources-2 D:\GITwork\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir +net.micode.notes.app-packageDebugResources-3 D:\GITwork\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir +net.micode.notes.app-merged_res-4 D:\GITwork\Notes-master\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-5 D:\GITwork\Notes-master\app\src\debug\res +net.micode.notes.app-main-6 D:\GITwork\Notes-master\app\src\main\res +>>>>>>> develop diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt index 3fc14cc..6dbbc13 100644 --- a/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,5 +1,6 @@ -- Merging decision tree log --- manifest +<<<<<<< HEAD ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 INJECTED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 @@ -225,3 +226,230 @@ ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:1 ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 android:name ADDED from D:\software gongcheng\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 +======= +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 + package + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml + android:versionName + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml + xmlns:android + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:18:11-69 + android:versionCode + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml +uses-sdk +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 + android:targetSdkVersion + INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml + android:minSdkVersion + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml +uses-permission#android.permission.WRITE_EXTERNAL_STORAGE +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 +uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 +uses-permission#android.permission.INTERNET +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 +uses-permission#android.permission.READ_CONTACTS +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 +uses-permission#android.permission.MANAGE_ACCOUNTS +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 +uses-permission#android.permission.AUTHENTICATE_ACCOUNTS +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 +uses-permission#android.permission.GET_ACCOUNTS +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 +uses-permission#android.permission.USE_CREDENTIALS +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 +uses-permission#android.permission.RECEIVE_BOOT_COMPLETED +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 +application +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 +INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 + android:extractNativeLibs + INJECTED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml + android:label + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 + android:icon + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 +activity#net.micode.notes.ui.NotesListActivity +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 + android:label + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 + android:launchMode + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 + android:windowSoftInputMode + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 + android:uiOptions + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 + android:configChanges + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 + android:theme + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 +intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 +action#android.intent.action.MAIN +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 +category#android.intent.category.LAUNCHER +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 +activity#net.micode.notes.ui.NoteEditActivity +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 + android:launchMode + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 + android:configChanges + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 + android:theme + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:54: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:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 +action#android.intent.action.VIEW +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 +category#android.intent.category.DEFAULT +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +data +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 + android:mimeType + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62: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:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 +action#android.intent.action.INSERT_OR_EDIT +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 +intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 +action#android.intent.action.SEARCH +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 +meta-data#android.app.searchable +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 + android:resource + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 +provider#net.micode.notes.data.NotesProvider +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 + android:authorities + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 + android:multiprocess + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 +receiver#net.micode.notes.widget.NoteWidgetProvider_2x +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 + android:label + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:89: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:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +action#android.appwidget.action.APPWIDGET_UPDATE +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +action#android.appwidget.action.APPWIDGET_DELETED +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +action#android.intent.action.PRIVACY_MODE_CHANGED +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +meta-data#android.appwidget.provider +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 + android:resource + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +receiver#net.micode.notes.widget.NoteWidgetProvider_4x +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 + android:label + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 +receiver#net.micode.notes.ui.AlarmInitReceiver +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 +intent-filter#action:name:android.intent.action.BOOT_COMPLETED +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 +action#android.intent.action.BOOT_COMPLETED +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 +receiver#net.micode.notes.ui.AlarmReceiver +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 + android:process + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 +activity#net.micode.notes.ui.AlarmAlertActivity +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 + android:label + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 + android:launchMode + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 + android:theme + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 +activity#net.micode.notes.ui.NotesPreferenceActivity +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 + android:label + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 + android:launchMode + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 + android:theme + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 +service#net.micode.notes.gtask.remote.GTaskSyncService +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 + android:exported + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 +meta-data#android.app.default_searchable +ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 + android:value + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 + android:name + ADDED from D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 +>>>>>>> develop diff --git a/res/values/styles.xml b/res/values/styles.xml index d750e65..b1df8f4 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -63,7 +63,7 @@ \ No newline at end of file