diff --git a/Src/.gradle/7.5/executionHistory/executionHistory.bin b/Src/.gradle/7.5/executionHistory/executionHistory.bin index 615a68c..2afe1fd 100644 Binary files a/Src/.gradle/7.5/executionHistory/executionHistory.bin and b/Src/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/Src/.gradle/7.5/executionHistory/executionHistory.lock b/Src/.gradle/7.5/executionHistory/executionHistory.lock index 1cdc066..8362833 100644 Binary files a/Src/.gradle/7.5/executionHistory/executionHistory.lock and b/Src/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/Src/.gradle/7.5/fileHashes/fileHashes.bin b/Src/.gradle/7.5/fileHashes/fileHashes.bin index 06eb818..4b9fc8c 100644 Binary files a/Src/.gradle/7.5/fileHashes/fileHashes.bin and b/Src/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/Src/.gradle/7.5/fileHashes/fileHashes.lock b/Src/.gradle/7.5/fileHashes/fileHashes.lock index f835102..99cb2ac 100644 Binary files a/Src/.gradle/7.5/fileHashes/fileHashes.lock and b/Src/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 1084a11..830464d 100644 Binary files a/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Src/.gradle/buildOutputCleanup/outputFiles.bin b/Src/.gradle/buildOutputCleanup/outputFiles.bin index 5fc6736..76b3111 100644 Binary files a/Src/.gradle/buildOutputCleanup/outputFiles.bin and b/Src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/Src/.gradle/file-system.probe b/Src/.gradle/file-system.probe index 5c170e9..e512a34 100644 Binary files a/Src/.gradle/file-system.probe and b/Src/.gradle/file-system.probe differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_0/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_0/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_0/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_1/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_1/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_1/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_2/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_2/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_3/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_3/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_4/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_4/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_4/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_5/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_5/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_5/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_6/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_6/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_6/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_7/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_7/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_7/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_8/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_8/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_8/graph.bin differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_9/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_9/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_da7987486c2a9527a4cccfb2dd1e102cbcf9b9fd44157051b90ca9f26a9826ea_bucket_9/graph.bin differ diff --git a/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 9f021dc..7ea5ed0 100644 Binary files a/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index b73300d..3ed818d 100644 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,3 +1,4 @@ +<<<<<<< HEAD #Sat Jan 11 10:32:30 CST 2025 net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat @@ -119,3 +120,141 @@ net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\github\\XiaoMiNote\\Src\\ net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +======= +<<<<<<< HEAD +<<<<<<< HEAD +#Mon Dec 30 21:15:33 CST 2024 +======= +#Mon Jan 06 19:32:33 CST 2025 +>>>>>>> a +======= +#Thu Jan 09 10:35:48 CST 2025 +>>>>>>> a +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/color/text_color_state_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_text_color_state_list.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable/button_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_button_background.xml.flat +net.micode.notes.app-main-7\:/drawable/edittext_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_edittext_background.xml.flat +<<<<<<< HEAD +net.micode.notes.app-main-7\:/drawable/ic_audio.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_audio.png.flat +======= +net.micode.notes.app-main-7\:/drawable/gesture_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_background.xml.flat +net.micode.notes.app-main-7\:/drawable/gesture_button_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_button_background.xml.flat +net.micode.notes.app-main-7\:/drawable/gesture_panel_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_panel_background.xml.flat +net.micode.notes.app-main-7\:/drawable/ic_audio.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_audio.png.flat +net.micode.notes.app-main-7\:/drawable/ic_delete.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_delete.xml.flat +net.micode.notes.app-main-7\:/drawable/ic_format_bold.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bold.xml.flat +net.micode.notes.app-main-7\:/drawable/ic_format_bullet.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bullet.xml.flat +net.micode.notes.app-main-7\:/drawable/ic_format_color.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_color.xml.flat +net.micode.notes.app-main-7\:/drawable/ic_format_italic.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_italic.xml.flat +net.micode.notes.app-main-7\:/drawable/ic_format_strikethrough.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_strikethrough.xml.flat +net.micode.notes.app-main-7\:/drawable/ic_format_underline.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_underline.xml.flat +net.micode.notes.app-main-7\:/drawable/ic_lock_outline.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_lock_outline.xml.flat +>>>>>>> a +net.micode.notes.app-main-7\:/drawable/ic_warning.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_warning.png.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable/toast_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_toast_background.xml.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/layout/activity_login.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat +net.micode.notes.app-main-7\:/layout/activity_register.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_register.xml.flat +net.micode.notes.app-main-7\:/layout/activity_user_management.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_user_management.xml.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_add_user.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_user.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/layout/item_user.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_item_user.xml.flat +net.micode.notes.app-main-7\:/layout/layout_custom_toast.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_layout_custom_toast.xml.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +<<<<<<< HEAD +======= +net.micode.notes.app-main-7\:/layout/note_gesture_password.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_password.xml.flat +net.micode.notes.app-main-7\:/layout/note_gesture_verify.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_verify.xml.flat +>>>>>>> a +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎？ - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤，請檢查SD卡 - SD卡被佔用，不能操作 - 同步已取消 - 同步失敗，發生內部錯誤 - 同步失敗，請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在，請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - 大 - 正常 - 文字大小 - 小 - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項，操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 - 請選擇google帳號，便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中，不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容，點擊新建便簽。 - 訪客模式下，便籤內容不可見 - \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index 1d7bf49..804b9b4 100644 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -13,6 +13,11 @@ #FFFFFF #2196F3 #FFFFFF +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 #F5F5F5 #2196F3 #80FFFFFF @@ -30,6 +35,10 @@ #2196F3 #4CAF50 #333333 +<<<<<<< HEAD +======= +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 #808080 #000000 #F5F5F5 @@ -80,9 +89,12 @@ (%d) 斜体 Have moved selected %1$d notes to %2$s folder +<<<<<<< HEAD 删除线 文字颜色 下划线 +======= +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 您可以通过其他方式重置密码 忘记密码？ 忘记密码 @@ -176,6 +188,11 @@ @color/text_color_state_list @color/hint_color +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 +<<<<<<< HEAD +======= +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 +======= +<<<<<<< HEAD + +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 短信 邮件 便签便签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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消确认请绘制手势密码请再次绘制手势密码确认手势太短，至少需要4个点手势匹配成功手势不匹配，请重试手势密码设置成功设置手势密码请绘制手势密码解锁笔记验证失败，还剩 %d 次机会验证失败次数过多，笔记已锁定图案错误，还可以尝试%d次验证成功忘记密码？忘记密码您可以通过其他方式重置密码确定取消加粗斜体下划线删除线项目符号文字颜色 %1$s 条符合“%2$s”的搜索结果 +<<<<<<< HEAD +======= + +======= + + 短信 + 邮件 + 便签便签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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消请绘制手势密码请再次绘制手势密码确认手势太短，至少需要4个点手势匹配成功手势不匹配，请重试手势密码设置成功设置手势密码 + %1$s 条符合“%2$s”的搜索结果 +<<<<<<< HEAD + 确认请绘制手势密码解锁笔记验证失败次数过多，笔记已锁定验证失败，还剩 %d 次机会验证成功忘记密码您可以通过其他方式重置密码确定忘记密码？取消图案错误，还可以尝试%d次 +>>>>>>> a +======= + 确认请绘制手势密码解锁笔记验证失败次数过多，笔记已锁定验证失败，还剩 %d 次机会验证成功忘记密码您可以通过其他方式重置密码确定忘记密码？取消图案错误，还可以尝试%d次斜体文字颜色加粗下划线删除线项目符号 +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 短信 郵件 便簽便簽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 +<<<<<<< HEAD + +======= +<<<<<<< HEAD +<<<<<<< HEAD + +======= + +>>>>>>> a +======= + +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 diff --git a/Src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 4e250ee..d472bb1 100644 --- a/Src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/Src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 28e7299..e72442e 100644 --- a/Src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/Src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 4bd4fb6..a12967b 100644 --- a/Src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/Src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index dd59ea2..5519490 100644 --- a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,3 +1,4 @@ +<<<<<<< HEAD #Sat Jan 11 10:33:04 CST 2025 base.0=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex base.1=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex @@ -8,6 +9,26 @@ base.5=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\merg base.6=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex base.7=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex base.8=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\8\\classes.dex +======= +<<<<<<< HEAD +<<<<<<< HEAD +#Tue Dec 31 09:10:17 CST 2024 +======= +#Mon Jan 06 20:13:24 CST 2025 +>>>>>>> a +======= +#Thu Jan 09 10:35:49 CST 2025 +>>>>>>> a +base.0=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex +base.1=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex +base.2=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex +base.3=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex +base.4=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex +base.5=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex +base.6=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex +base.7=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex +base.8=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\8\\classes.dex +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 path.0=classes.dex path.1=0/classes.dex path.2=11/classes.dex diff --git a/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 9b4f5d7..880264d 100644 --- a/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -6,284 +6,284 @@ 6 7 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml +8-->D:\gitnote\notes\app\src\main\AndroidManifest.xml 9 android:targetSdkVersion="21" /> -9-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml +9-->D:\gitnote\notes\app\src\main\AndroidManifest.xml 10 11 12 -12-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:9:5-71 -12-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:9:22-68 +12-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:9:5-71 +12-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:9:22-68 13 -13-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:10:5-80 -13-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:10:22-77 +13-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:10:5-80 +13-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:10:22-77 14 -14-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-81 -14-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:22-78 +14-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:11:5-81 +14-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:11:22-78 15 -15-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:12:5-80 -15-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:12:22-77 +15-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:12:5-80 +15-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:12:22-77 16 -16-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:13:5-67 -16-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:13:22-64 +16-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:13:5-67 +16-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:13:22-64 17 -17-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:5-72 -17-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:22-69 +17-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:14:5-72 +17-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:14:22-69 18 -18-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:15:5-81 -18-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:15:22-78 +18-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:5-81 +18-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:22-78 19 20 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:17:5-147:19 +20-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-147:19 21 android:debuggable="true" 22 android:icon="@drawable/icon_app" -22-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:18:9-42 +22-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:18:9-42 23 android:label="@string/app_name" -23-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:19:9-41 +23-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41 24 android:testOnly="true" > 25 26 27 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:22:9-29:20 +27-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:22:9-29:20 28 android:name="net.micode.notes.login.LoginActivity" -28-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:23:13-48 +28-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:23:13-48 29 android:launchMode="singleTop" > -29-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:24:13-43 +29-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:24:13-43 30 -30-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:25:13-28:29 +30-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:25:13-28:29 31 -31-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:26:17-69 -31-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:26:25-66 +31-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:17-69 +31-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:25-66 32 33 -33-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:27:17-77 -33-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:27:27-74 +33-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:17-77 +33-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:27-74 34 35 36 37 38 -38-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:32:9-60 -38-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:32:19-57 +38-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:9-60 +38-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:19-57 39 40 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:34:9-40:55 +40-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:34:9-40:55 41 android:name="net.micode.notes.ui.NotesListActivity" -41-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:35:13-49 +41-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:35:13-49 42 android:configChanges="keyboardHidden|orientation|screenSize" -42-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:36:13-74 +42-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:36:13-74 43 android:label="@string/app_name" -43-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:37:13-45 +43-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:37:13-45 44 android:launchMode="singleTop" -44-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:38:13-43 +44-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:38:13-43 45 android:theme="@style/NoteTheme" -45-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:39:13-45 +45-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:39:13-45 46 android:windowSoftInputMode="adjustPan" /> -46-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:40:13-52 +46-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:40:13-52 47 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:41:9-44:70 +47-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:41:9-44:70 48 android:name="net.micode.notes.ui.NoteGesturePasswordActivity" -48-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:42:13-59 +48-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:42:13-59 49 android:label="@string/menu_set_gesture" -49-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:43:13-53 +49-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:43:13-53 50 android:theme="@android:style/Theme.Holo.Light.Dialog" /> -50-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:44:13-67 +50-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:44:13-67 51 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:45:9-49:63 +51-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:45:9-49:63 52 android:name="net.micode.notes.ui.NoteGestureVerifyActivity" -52-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:46:13-57 +52-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:46:13-57 53 android:screenOrientation="portrait" -53-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:48:13-49 +53-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:48:13-49 54 android:theme="@style/GestureVerifyTheme" -54-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:47:13-54 +54-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:47:13-54 55 android:windowSoftInputMode="stateAlwaysHidden" /> -55-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:49:13-60 +55-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:49:13-60 56 57 -57-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:51:9-65 -57-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:51:19-63 +57-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-65 +57-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:19-63 58 59 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:53:9-79:20 +59-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:9-79:20 60 android:name="net.micode.notes.ui.NoteEditActivity" -60-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:13-48 +60-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:54:13-48 61 android:configChanges="keyboardHidden|orientation|screenSize" -61-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:55:13-74 +61-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-74 62 android:launchMode="singleTop" -62-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:13-43 +62-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:56:13-43 63 android:theme="@style/NoteTheme" > -63-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:57:13-45 +63-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:13-45 64 -64-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:58:13-65:29 -64-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:59:17-38 +64-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:58:13-65:29 +64-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-38 65 -65-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:61:17-69 -65-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:61:25-66 +65-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-69 +65-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:25-66 66 67 -67-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:62:17-76 -67-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:62:27-73 +67-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76 +67-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73 68 69 -69-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:17-78 -69-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:23-75 +69-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78 +69-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75 70 -70-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:17-78 -70-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:23-75 +70-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78 +70-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75 71 72 -72-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:66:13-71:29 +72-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:66:13-71:29 73 -73-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:67:17-79 -73-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:67:25-76 +73-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:67:17-79 +73-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:67:25-76 74 75 -75-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:62:17-76 -75-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:62:27-73 +75-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76 +75-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73 76 77 -77-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:17-78 -77-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:23-75 +77-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78 +77-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75 78 -78-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:17-78 -78-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:23-75 +78-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78 +78-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75 79 80 -80-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:72:13-75:29 +80-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:72:13-75:29 81 -81-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:73:17-71 -81-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:73:25-68 +81-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:17-71 +81-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:25-68 82 83 -83-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:62:17-76 -83-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:62:27-73 +83-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76 +83-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73 84 85 86 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:76:13-78:54 +86-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:13-78:54 87 android:name="android.app.searchable" -87-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:77:17-54 +87-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:77:17-54 88 android:resource="@xml/searchable" /> -88-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:78:17-51 +88-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:78:17-51 89 90 91 92 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:82:9-85:43 +92-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:9-85:43 93 android:name="net.micode.notes.data.NotesProvider" -93-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:83:13-63 +93-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-63 94 android:authorities="micode_notes" -94-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:84:13-47 +94-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:84:13-47 95 android:multiprocess="true" /> -95-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:85:13-40 +95-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:85:13-40 96 97 98 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:88:9-98:20 +98-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:9-98:20 99 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -99-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:13-57 +99-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-57 100 android:label="@string/app_widget2x2" > -100-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:90:13-50 +100-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:13-50 101 -101-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:13-94:29 +101-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:13-94:29 102 -102-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:92:17-84 -102-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:92:25-81 +102-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:17-84 +102-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:25-81 103 -103-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:93:17-85 -103-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:93:25-82 +103-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:17-85 +103-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:25-82 104 105 106 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:95:13-97:58 +106-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:13-97:58 107 android:name="android.appwidget.provider" -107-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:96:17-58 +107-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:96:17-58 108 android:resource="@xml/widget_2x_info" /> -108-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:97:17-55 +108-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:97:17-55 109 110 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:100:9-110:20 +110-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:9-110:20 111 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -111-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:101:13-57 +111-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:101:13-57 112 android:label="@string/app_widget4x4" > -112-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:102:13-50 +112-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:102:13-50 113 -113-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:13-94:29 +113-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:13-94:29 114 -114-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:92:17-84 -114-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:92:25-81 +114-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:17-84 +114-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:25-81 115 -115-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:93:17-85 -115-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:93:25-82 +115-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:17-85 +115-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:25-82 116 117 118 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:95:13-97:58 +118-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:13-97:58 119 android:name="android.appwidget.provider" -119-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:96:17-58 +119-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:96:17-58 120 android:resource="@xml/widget_4x_info" /> -120-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:97:17-55 +120-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:97:17-55 121 122 123 124 -124-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:113:9-117:20 -124-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:113:19-55 +124-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:9-117:20 +124-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:19-55 125 -125-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:114:13-116:29 +125-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:114:13-116:29 126 -126-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:115:17-79 -126-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:115:25-76 +126-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:17-79 +126-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:25-76 127 128 129 130 131 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:120:9-122:41 +131-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:9-122:41 132 android:name="net.micode.notes.ui.AlarmReceiver" -132-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:121:13-61 +132-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:121:13-61 133 android:process=":remote" /> -133-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:122:13-38 +133-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:122:13-38 134 135 136 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:125:9-129:87 +136-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:9-129:87 137 android:name="net.micode.notes.ui.AlarmAlertActivity" -137-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:126:13-50 +137-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-50 138 android:label="@string/app_name" -138-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:127:13-45 +138-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-45 139 android:launchMode="singleInstance" -139-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:128:13-48 +139-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:128:13-48 140 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> -140-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:129:13-75 +140-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:129:13-75 141 142 143 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:132:9-136:72 +143-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:9-136:72 144 android:name="net.micode.notes.ui.NotesPreferenceActivity" -144-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:133:13-71 +144-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-71 145 android:label="@string/preferences_title" -145-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:134:13-54 +145-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-54 146 android:launchMode="singleTop" -146-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:135:13-43 +146-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:135:13-43 147 android:theme="@android:style/Theme.Holo.Light" /> -147-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:136:13-60 +147-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:136:13-60 148 149 150 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:139:9-141:40 +150-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:9-141:40 151 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -151-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:140:13-74 +151-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:140:13-74 152 android:exported="false" /> -152-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:141:13-37 +152-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:141:13-37 153 154 155 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:144:9-146:52 +155-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:9-146:52 156 android:name="android.app.default_searchable" -156-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:145:13-58 +156-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:145:13-58 157 android:value=".ui.NoteEditActivity" /> -157-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:146:13-49 +157-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:146:13-49 158 159 160 diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index ff53baf..9053ff4 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", @@ -25,12 +25,18 @@ { "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { +<<<<<<< HEAD "startLines": "16", "startColumns": "4", "startOffsets": "336", "endLines": "19", "endColumns": "19", "endOffsets": "441" +======= + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" +>>>>>>> a }, "to": { "startLines": "2", @@ -40,13 +46,43 @@ "endColumns": "19", "endOffsets": "210" } +<<<<<<< HEAD +======= + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { +<<<<<<< HEAD + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" +======= + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,135,136,-1,-1,-1,-1,-1,133,-1,-1,-1,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,-1,-1,-1,-1,-1,4,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7525,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7426,7315,7372,-1,-1,-1,-1,-1,7196,-1,-1,-1,7259,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7491,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,56,53,-1,-1,-1,-1,-1,62,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7558,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7486,7367,7421,-1,-1,-1,-1,-1,7254,-1,-1,-1,7310,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7520,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,922,969,1033,1087,1137,1199,1267,1344,1403,1468,1531,1586,1646,1709,1763,1823,1876,1938,2023,2104,2169,2226,2280,2336,2387,2445,2503,2562,2625,2692,2761,2821,2877,2927,2986,3029,3082,3125,3176,3226,3286,3339,3390,3436,3484,3532,3578,3625,3675,3720,3779,3831,3883,3926,3973,4029,4084,4139,4191,4235,4277,4318,4368,4427,4478,4527,4576,4623,4670,4717,4762,4813,4866,4900,4975,5034,5091,5165,5229,5298,5376,5486,5590,5663,5729,5784,5849,5914,5963,6046,6124,6162,6207,6255,6317,6374,6429,6488,6555,6613,6675,6723,6768,6816,6867,6933", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,72,65,72,49,39,47,47,44,56,37,46,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,33,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,917,964,1028,1082,1132,1194,1262,1339,1398,1463,1526,1581,1641,1704,1758,1818,1871,1933,2018,2099,2164,2221,2275,2331,2382,2440,2498,2557,2620,2687,2756,2816,2872,2922,2981,3024,3077,3120,3171,3221,3281,3334,3385,3431,3479,3527,3573,3620,3670,3715,3774,3826,3878,3921,3968,4024,4079,4134,4186,4230,4272,4313,4363,4422,4473,4522,4571,4618,4665,4712,4757,4808,4861,4895,4970,5029,5086,5160,5224,5293,5371,5481,5585,5658,5724,5779,5844,5909,5958,6041,6119,6157,6202,6250,6312,6369,6424,6483,6550,6608,6670,6718,6763,6811,6862,6928,6994" + } +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 } ] }, { - "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { +<<<<<<< HEAD "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "15,17,19,21,13", @@ -135,12 +171,45 @@ "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594,1647,1705", "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,52,57,56", "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1642,1700,1757" +======= + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,141,145,-1,-1,-1,142,-1,144,146,143,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7586,7776,-1,-1,-1,7629,-1,7723,7823,7674,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7624,7818,-1,-1,-1,7669,-1,7771,7869,7718,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130", + "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,922,969,1033,1087,1137,1199,1267,1344,1403,1468,1531,1586,1646,1709,1763,1823,1866,1913,1966,2028,2113,2158,2239,2292,2343,2392,2457,2514,2568,2624,2675,2733,2791,2850,2913,2980,3049,3109,3165,3215,3274,3317,3370,3413,3464,3514,3574,3627,3678,3724,3772,3820,3866,3913,3963,4008,4067,4119,4171,4214,4261,4317,4372,4427,4479,4523,4565,4606,4656,4715,4766,4815,4864,4911,4958,5005,5050,5101,5154,5188,5263,5322,5379,5453,5517,5586,5664,5774,5878,5951,6017,6072,6137,6202,6251,6334,6412,6450,6495,6543,6605,6662,6717,6776,6843,6901,6963,7011,7056,7104,7155,7221", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130", + "endColumns": "14,72,65,72,49,39,47,47,44,56,37,46,63,53,49,61,67,76,58,64,62,54,59,62,53,59,42,46,52,61,84,44,80,52,50,48,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,33,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,917,964,1028,1082,1132,1194,1262,1339,1398,1463,1526,1581,1641,1704,1758,1818,1861,1908,1961,2023,2108,2153,2234,2287,2338,2387,2452,2509,2563,2619,2670,2728,2786,2845,2908,2975,3044,3104,3160,3210,3269,3312,3365,3408,3459,3509,3569,3622,3673,3719,3767,3815,3861,3908,3958,4003,4062,4114,4166,4209,4256,4312,4367,4422,4474,4518,4560,4601,4651,4710,4761,4810,4859,4906,4953,5000,5045,5096,5149,5183,5258,5317,5374,5448,5512,5581,5659,5769,5873,5946,6012,6067,6132,6197,6246,6329,6407,6445,6490,6538,6600,6657,6712,6771,6838,6896,6958,7006,7051,7099,7150,7216,7282" +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", @@ -151,6 +220,292 @@ "endLines": "124,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", "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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" +>>>>>>> a + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", +<<<<<<< HEAD + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" +======= + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,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" +>>>>>>> a + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", + "map": [ + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml", + "from": { +<<<<<<< HEAD +<<<<<<< HEAD + "startLines": "17,19,18,20,21,16", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "388,515,451,574,632,331", + "endColumns": "50,46,51,44,44,56", + "endOffsets": "434,557,498,614,672,383" + }, + "to": { + "startLines": "12,13,14,15,16,17", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "420,471,518,570,615,660", + "endColumns": "50,46,51,44,44,56", + "endOffsets": "466,513,565,610,655,712" +======= + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" +======= + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,43,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1688,1741,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,57,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1736,1794,-1" +>>>>>>> a + }, + "to": { + "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36", + "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", + "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594,1647,1705", + "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,52,57,56", + "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1642,1700,1757" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "155,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "9351,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9063,9253,-1,-1,-1,-1,9106,-1,9200,9300,9151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "159,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "9755,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9101,9295,-1,-1,-1,-1,9146,-1,9248,9346,9195,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "42,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172", + "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2024,2377,2473,2556,2652,2721,2764,2816,2868,2917,2980,3018,3065,3129,3187,3238,3322,3416,3524,3595,3679,3762,3828,3911,4013,4074,4136,4187,4265,4308,4355,4408,4468,4573,4632,4677,4779,4832,4883,4932,4997,5054,5108,5164,5215,5273,5331,5390,5453,5520,5589,5649,5705,5760,5831,5880,5938,5985,6044,6101,6172,6233,6290,6340,6392,6445,6495,6545,6605,6658,6724,6786,6849,6896,6951,7039,7097,7159,7211,7261,7306,7349,7409,7476,7531,7586,7639,7686,7739,7795,7843,7898,7951,7985,8069,8136,8200,8296,8370,8451,8540,8703,8847,8926,9001,9083,9142,9222,9302,9357,9479,9582,9623,9676,9733,9807,9872,9940,10026,10106,10175,10269,10328,10383,10445,10505,10615", + "endLines": "46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172", + "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,42,46,52,59,104,58,44,101,52,50,48,64,56,53,55,50,57,57,58,62,66,68,59,55,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "2372,2468,2551,2647,2716,2759,2811,2863,2912,2975,3013,3060,3124,3182,3233,3317,3411,3519,3590,3674,3757,3823,3906,4008,4069,4131,4182,4260,4303,4350,4403,4463,4568,4627,4672,4774,4827,4878,4927,4992,5049,5103,5159,5210,5268,5326,5385,5448,5515,5584,5644,5700,5755,5826,5875,5933,5980,6039,6096,6167,6228,6285,6335,6387,6440,6490,6540,6600,6653,6719,6781,6844,6891,6946,7034,7092,7154,7206,7256,7301,7344,7404,7471,7526,7581,7634,7681,7734,7790,7838,7893,7946,7980,8064,8131,8195,8291,8365,8446,8535,8698,8842,8921,8996,9078,9137,9217,9297,9352,9474,9577,9618,9671,9728,9802,9867,9935,10021,10101,10170,10264,10323,10378,10440,10500,10610,10700" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "173,178,185,189,193,197,200,204,208,212,216,220,224", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "10705,10983,11390,11598,11809,11974,12134,12317,12502,12687,12890,13096,13279", + "endLines": "177,184,188,192,196,199,203,207,211,215,219,223,227", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "10978,11385,11593,11804,11969,12129,12312,12497,12682,12885,13091,13274,13475" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "37,38,39,40,41", + "startColumns": "4,4,4,4,4", + "startOffsets": "1762,1814,1867,1920,1972", + "endColumns": "51,52,52,51,51", +<<<<<<< HEAD + "endOffsets": "1698,1751,1804,1856,1908" +>>>>>>> a +======= + "endOffsets": "1809,1862,1915,1967,2019" +>>>>>>> a + } + } + ] + }, + { + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", + "map": [ + { +<<<<<<< HEAD + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml", +======= + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml", +>>>>>>> a + "from": { + "startLines": "17,19,18,20,21,16", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "388,515,451,574,632,331", + "endColumns": "50,46,51,44,44,56", + "endOffsets": "434,557,498,614,672,383" + }, + "to": { +<<<<<<< HEAD + "startLines": "23,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "979,1332,1428,1511,1607,1676,1719,1771,1823,1872,1935,1993,2044,2128,2222,2330,2401,2485,2568,2634,2717,2819,2880,2942,2993,3071,3124,3184,3289,3348,3450,3505,3576,3625,3683,3730,3789,3846,3917,3978,4035,4085,4137,4190,4240,4290,4350,4403,4469,4531,4594,4641,4696,4784,4842,4904,4954,4999,5042,5102,5169,5224,5279,5332,5379,5432,5488,5536,5591,5644,5728,5795,5859,5955,6029,6110,6199,6362,6506,6585,6660,6742,6801,6881,6961,7016,7138,7241,7282,7335,7392,7466,7531,7599,7685,7765,7834,7928,7987,8042,8104,8164,8274", + "endLines": "27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1327,1423,1506,1602,1671,1714,1766,1818,1867,1930,1988,2039,2123,2217,2325,2396,2480,2563,2629,2712,2814,2875,2937,2988,3066,3119,3179,3284,3343,3445,3500,3571,3620,3678,3725,3784,3841,3912,3973,4030,4080,4132,4185,4235,4285,4345,4398,4464,4526,4589,4636,4691,4779,4837,4899,4949,4994,5037,5097,5164,5219,5274,5327,5374,5427,5483,5531,5586,5639,5723,5790,5854,5950,6024,6105,6194,6357,6501,6580,6655,6737,6796,6876,6956,7011,7133,7236,7277,7330,7387,7461,7526,7594,7680,7760,7829,7923,7982,8037,8099,8159,8269,8359" + } + }, + { +======= + "startLines": "12,13,14,15,16,17", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "420,471,518,570,615,660", + "endColumns": "50,46,51,44,44,56", + "endOffsets": "466,513,565,610,655,712" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "136,72,75,74,73,19,20,21,118,119,130,128,127,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,132,133,134,131,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,135,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,126,124,123,125,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,4,4,4,4,4,4,4", + "startOffsets": "8407,3898,4159,4063,3994,827,870,922,7506,7555,8065,7951,7900,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,8009,8188,8239,8297,8129,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,8355,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7859,7732,7675,7785,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "140,72,75,74,73,19,20,21,118,119,130,128,127,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,132,133,134,131,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,135,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,126,124,123,125,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,55,50,57,57,58,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8811,3989,4237,4154,4058,865,917,969,7550,7613,8124,8004,7946,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,8060,8234,8292,8350,8183,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,8402,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7895,7780,7727,7854,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + }, + "to": { + "startLines": "23,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136", + "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,4,4,4,4,4,4,4", + "startOffsets": "979,1332,1428,1511,1607,1676,1719,1771,1823,1872,1935,1999,2057,2108,2192,2286,2394,2465,2549,2632,2698,2781,2883,2944,3006,3057,3135,3188,3248,3353,3412,3514,3570,3621,3679,3737,3796,3851,3922,3971,4029,4076,4135,4192,4263,4324,4381,4431,4483,4536,4586,4636,4696,4749,4815,4877,4940,4987,5042,5130,5188,5250,5302,5352,5397,5440,5500,5567,5622,5677,5730,5777,5830,5886,5934,5989,6042,6126,6193,6257,6353,6427,6508,6597,6760,6904,6983,7058,7140,7199,7279,7359,7414,7536,7639,7680,7733,7790,7864,7929,7997,8083,8163,8232,8326,8385,8440,8502,8562,8672", + "endLines": "27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136", + "endColumns": "14,95,82,95,68,42,51,51,48,62,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,55,50,57,57,58,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1327,1423,1506,1602,1671,1714,1766,1818,1867,1930,1994,2052,2103,2187,2281,2389,2460,2544,2627,2693,2776,2878,2939,3001,3052,3130,3183,3243,3348,3407,3509,3565,3616,3674,3732,3791,3846,3917,3966,4024,4071,4130,4187,4258,4319,4376,4426,4478,4531,4581,4631,4691,4744,4810,4872,4935,4982,5037,5125,5183,5245,5297,5347,5392,5435,5495,5562,5617,5672,5725,5772,5825,5881,5929,5984,6037,6121,6188,6252,6348,6422,6503,6592,6755,6899,6978,7053,7135,7194,7274,7354,7409,7531,7634,7675,7728,7785,7859,7924,7992,8078,8158,8227,8321,8380,8435,8497,8557,8667,8757" + } + }, + { +>>>>>>> a + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "10,18", + "startColumns": "4,4", + "startOffsets": "237,524", + "endLines": "15,21", + "endColumns": "19,19", + "endOffsets": "492,639" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "71,49,55,66,61,15,20,25,31,37,10,43", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2752,1798,2043,2507,2299,421,628,837,1066,1314,215,1560", + "endLines": "75,52,58,69,63,18,23,28,34,40,13,46", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "3025,2001,2249,2720,2454,599,808,1017,1264,1515,393,1756" + }, + "to": { +<<<<<<< HEAD + "startLines": "130,135,139,143,147,150,154,158,162,166,170,174", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8364,8642,8850,9061,9226,9386,9569,9754,9939,10142,10348,10531", + "endLines": "134,138,142,146,149,153,157,161,165,169,173,177", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8637,8845,9056,9221,9381,9564,9749,9934,10137,10343,10526,10727" +======= + "startLines": "137,142,146,150,154,157,161,165,169,173,177,181", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8762,9040,9248,9459,9624,9784,9967,10152,10337,10540,10746,10929", + "endLines": "141,145,149,153,156,160,164,168,172,176,180,184", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "9035,9243,9454,9619,9779,9962,10147,10332,10535,10741,10924,11125" +>>>>>>> a + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\dimens.xml", +<<<<<<< HEAD + "from": { + "startLines": "15,17,19,21,13", + "startColumns": "4,4,4,4,4", + "startOffsets": "335,409,484,558,262", + "endColumns": "51,52,52,51,51", + "endOffsets": "382,457,532,605,309" + }, + "to": { + "startLines": "18,19,20,21,22", + "startColumns": "4,4,4,4,4", + "startOffsets": "717,769,822,875,927", + "endColumns": "51,52,52,51,51", + "endOffsets": "764,817,870,922,974" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", +======= +>>>>>>> a + "from": { + "startLines": "15,17,19,21,13", + "startColumns": "4,4,4,4,4", + "startOffsets": "335,409,484,558,262", + "endColumns": "51,52,52,51,51", + "endOffsets": "382,457,532,605,309" + }, + "to": { + "startLines": "18,19,20,21,22", + "startColumns": "4,4,4,4,4", + "startOffsets": "717,769,822,875,927", + "endColumns": "51,52,52,51,51", + "endOffsets": "764,817,870,922,974" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,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", + "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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 7d35f61..271e8f4 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,6 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { +<<<<<<< HEAD "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "147,71,70,69,68,19,20,21,112,113,139,121,123,120,119,26,77,78,76,75,74,90,89,88,80,60,141,145,29,30,81,142,72,144,146,143,137,135,136,122,125,126,127,124,133,131,130,129,134,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,128,42,61,40,41,65,28,34,36,33,35,32,31,25,24,138,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", @@ -12,6 +13,33 @@ "endLines": "149,71,70,69,68,19,20,21,112,113,139,121,123,120,119,26,77,78,76,75,74,90,89,88,80,60,141,145,29,30,81,142,72,144,146,143,137,135,136,122,125,126,127,124,133,131,130,129,134,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,128,42,61,40,41,65,28,34,36,33,35,32,31,25,24,138,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "endColumns": "14,72,65,72,49,39,47,47,44,56,37,46,63,53,49,61,67,76,58,64,62,54,59,62,53,59,42,46,52,61,84,44,80,52,50,48,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,33,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": "8046,3563,3490,3424,3351,862,910,958,6123,6180,7558,6574,6694,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,7624,7818,1417,1479,4195,7669,3644,7771,7869,7718,7486,7367,7421,6630,6804,6862,6920,6753,7254,7168,7101,7032,7310,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,6972,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,7520,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" +======= + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", +<<<<<<< HEAD +======= + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,141,145,-1,-1,-1,142,-1,144,146,143,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7586,7776,-1,-1,-1,7629,-1,7723,7823,7674,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7624,7818,-1,-1,-1,7669,-1,7771,7869,7718,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130", @@ -21,9 +49,21 @@ "endColumns": "14,72,65,72,49,39,47,47,44,56,37,46,63,53,49,61,67,76,58,64,62,54,59,62,53,59,42,46,52,61,84,44,80,52,50,48,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,33,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endOffsets": "379,452,518,591,641,681,729,777,822,879,917,964,1028,1082,1132,1194,1262,1339,1398,1463,1526,1581,1641,1704,1758,1818,1861,1908,1961,2023,2108,2153,2234,2287,2338,2387,2452,2509,2563,2619,2670,2728,2786,2845,2908,2975,3044,3104,3160,3210,3269,3312,3365,3408,3459,3509,3569,3622,3673,3719,3767,3815,3861,3908,3958,4003,4062,4114,4166,4209,4256,4312,4367,4422,4474,4518,4560,4601,4651,4710,4761,4810,4859,4906,4953,5000,5045,5096,5149,5183,5258,5317,5374,5448,5512,5581,5659,5769,5873,5946,6012,6067,6132,6197,6246,6329,6407,6445,6490,6538,6600,6657,6712,6771,6838,6896,6958,7006,7051,7099,7150,7216,7282" } +<<<<<<< HEAD }, { "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", +======= + } + ] + }, + { + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml", + "map": [ + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 "from": { "startLines": "16", "startColumns": "4", @@ -40,6 +80,45 @@ "endColumns": "19", "endOffsets": "210" } +<<<<<<< HEAD +======= + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { +<<<<<<< HEAD + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" +======= + "startLines": "128,71,70,69,68,19,20,21,112,113,122,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,121,124,125,126,123,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,127,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,4,4,4,4,4,4,4", + "startOffsets": "6930,3495,3429,3356,3306,827,867,915,6083,6128,6588,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6532,6711,6762,6820,6652,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,6878,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "130,71,70,69,68,19,20,21,112,113,122,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,121,124,125,126,123,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,127,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,55,50,57,57,58,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,51,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": "7102,3563,3490,3424,3351,862,910,958,6123,6180,6647,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6583,6757,6815,6873,6706,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,6925,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113", + "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,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,948,1002,1052,1114,1182,1259,1318,1383,1446,1501,1561,1624,1678,1738,1791,1853,1938,2019,2075,2126,2184,2242,2301,2351,2410,2453,2506,2549,2600,2650,2710,2763,2814,2860,2908,2956,3002,3049,3099,3144,3203,3255,3307,3350,3397,3453,3508,3563,3615,3659,3701,3742,3792,3851,3902,3951,4000,4047,4094,4141,4186,4237,4290,4365,4424,4481,4555,4619,4688,4766,4876,4980,5053,5119,5174,5239,5304,5353,5436,5514,5552,5597,5645,5707,5764,5819,5878,5945,6003,6065,6113,6158,6206,6257,6323", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113", + "endColumns": "14,72,65,72,49,39,47,47,44,56,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,55,50,57,57,58,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,943,997,1047,1109,1177,1254,1313,1378,1441,1496,1556,1619,1673,1733,1786,1848,1933,2014,2070,2121,2179,2237,2296,2346,2405,2448,2501,2544,2595,2645,2705,2758,2809,2855,2903,2951,2997,3044,3094,3139,3198,3250,3302,3345,3392,3448,3503,3558,3610,3654,3696,3737,3787,3846,3897,3946,3995,4042,4089,4136,4181,4232,4285,4360,4419,4476,4550,4614,4683,4761,4871,4975,5048,5114,5169,5234,5299,5348,5431,5509,5547,5592,5640,5702,5759,5814,5873,5940,5998,6060,6108,6153,6201,6252,6318,6384" +>>>>>>> a + } +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 } ] } diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 3d51db5..b251941 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,11 +1,12 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", "map": [ { "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\dimens.xml", "from": { +<<<<<<< HEAD "startLines": "15,17,19,21,13", "startColumns": "4,4,4,4,4", "startOffsets": "335,409,484,558,262", @@ -18,11 +19,42 @@ "startOffsets": "1762,1814,1867,1920,1972", "endColumns": "51,52,52,51,51", "endOffsets": "1809,1862,1915,1967,2019" +======= +<<<<<<< HEAD +<<<<<<< HEAD + "startLines": "17,19,18,20,21,16", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "388,515,451,574,632,331", + "endColumns": "50,46,51,44,44,56", + "endOffsets": "434,557,498,614,672,383" + }, + "to": { + "startLines": "12,13,14,15,16,17", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "420,471,518,570,615,660", + "endColumns": "50,46,51,44,44,56", + "endOffsets": "466,513,565,610,655,712" +======= + "startLines": "-1,-1,-1,23,27,29,28,38,40,36,34,33,37,24,25,32,30,31,39,26,-1,-1,-1", + "startColumns": "-1,-1,-1,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,-1,-1,-1", + "startOffsets": "-1,-1,-1,711,931,1045,991,1504,1614,1398,1323,1269,1451,764,823,1215,1103,1158,1558,878,-1,-1,-1", + "endColumns": "-1,-1,-1,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,-1,-1,-1", + "endOffsets": "-1,-1,-1,759,986,1098,1040,1553,1662,1446,1371,1318,1499,818,873,1264,1153,1210,1609,926,-1,-1,-1" + }, + "to": { + "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594", + "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,56", + "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1646" +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 } }, { "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\strings.xml", "from": { +<<<<<<< HEAD "startLines": "155,72,75,74,73,19,20,21,118,119,147,129,131,128,127,26,81,82,80,79,78,94,93,92,84,39,38,64,149,153,29,30,85,41,150,76,152,154,151,145,143,144,130,133,134,135,132,141,139,138,137,142,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,136,46,65,44,45,69,28,34,36,33,35,32,31,25,24,146,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,126,124,123,125,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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", "startOffsets": "9351,3898,4159,4063,3994,827,870,922,7506,7555,9002,8009,8112,7951,7900,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,9063,9253,1486,1539,4944,2097,9106,4242,9200,9300,9151,8903,8792,8849,8056,8235,8286,8344,8176,8673,8583,8514,8454,8736,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,8402,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,8968,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7859,7732,7675,7785,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", @@ -37,6 +69,31 @@ "endLines": "46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172", "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,42,46,52,59,104,58,44,101,52,50,48,64,56,53,55,50,57,57,58,62,66,68,59,55,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", "endOffsets": "2372,2468,2551,2647,2716,2759,2811,2863,2912,2975,3013,3060,3124,3182,3233,3317,3411,3519,3590,3674,3757,3823,3906,4008,4069,4131,4182,4260,4303,4350,4403,4463,4568,4627,4672,4774,4827,4878,4927,4992,5049,5103,5159,5210,5268,5326,5385,5448,5515,5584,5644,5700,5755,5826,5875,5933,5980,6039,6096,6167,6228,6285,6335,6387,6440,6490,6540,6600,6653,6719,6781,6844,6891,6946,7034,7092,7154,7206,7256,7301,7344,7404,7471,7526,7581,7634,7681,7734,7790,7838,7893,7946,7980,8064,8131,8195,8291,8365,8446,8535,8698,8842,8921,8996,9078,9137,9217,9297,9352,9474,9577,9618,9671,9728,9802,9867,9935,10021,10101,10170,10264,10323,10378,10440,10500,10610,10700" +======= + "startLines": "148,-1,-1,-1,-1,-1,-1,-1,-1,-1,147,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,145,143,144,-1,-1,-1,-1,-1,141,-1,-1,-1,142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,146,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,-1,-1,-1,-1,-1,4,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "9040,-1,-1,-1,-1,-1,-1,-1,-1,-1,9002,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8903,8792,8849,-1,-1,-1,-1,-1,8673,-1,-1,-1,8736,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8968,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "152,-1,-1,-1,-1,-1,-1,-1,-1,-1,147,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,145,143,144,-1,-1,-1,-1,-1,141,-1,-1,-1,142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,146,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,56,53,-1,-1,-1,-1,-1,62,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "9444,-1,-1,-1,-1,-1,-1,-1,-1,-1,9035,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8963,8844,8898,-1,-1,-1,-1,-1,8731,-1,-1,-1,8787,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8997,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { +<<<<<<< HEAD + "startLines": "23,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "979,1332,1428,1511,1607,1676,1719,1771,1823,1872,1935,1993,2044,2128,2222,2330,2401,2485,2568,2634,2717,2819,2880,2942,2993,3071,3124,3184,3289,3348,3450,3505,3576,3625,3683,3730,3789,3846,3917,3978,4035,4085,4137,4190,4240,4290,4350,4403,4469,4531,4594,4641,4696,4784,4842,4904,4954,4999,5042,5102,5169,5224,5279,5332,5379,5432,5488,5536,5591,5644,5728,5795,5859,5955,6029,6110,6199,6362,6506,6585,6660,6742,6801,6881,6961,7016,7138,7241,7282,7335,7392,7466,7531,7599,7685,7765,7834,7928,7987,8042,8104,8164,8274", + "endLines": "27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1327,1423,1506,1602,1671,1714,1766,1818,1867,1930,1988,2039,2123,2217,2325,2396,2480,2563,2629,2712,2814,2875,2937,2988,3066,3119,3179,3284,3343,3445,3500,3571,3620,3678,3725,3784,3841,3912,3973,4030,4080,4132,4185,4235,4285,4345,4398,4464,4526,4589,4636,4691,4779,4837,4899,4949,4994,5037,5097,5164,5219,5274,5327,5374,5427,5483,5531,5586,5639,5723,5790,5854,5950,6024,6105,6194,6357,6501,6580,6655,6737,6796,6876,6956,7011,7133,7236,7277,7330,7387,7461,7526,7594,7680,7760,7829,7923,7982,8037,8099,8159,8269,8359" +======= + "startLines": "40,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164", + "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "1913,2266,2362,2445,2541,2610,2653,2705,2757,2806,2869,2907,2954,3018,3076,3127,3211,3305,3413,3484,3568,3651,3717,3800,3902,3963,4025,4076,4154,4207,4267,4372,4431,4533,4598,4655,4709,4765,4816,4874,4932,4991,5054,5121,5190,5250,5306,5361,5432,5481,5539,5586,5645,5702,5773,5834,5891,5941,5993,6046,6096,6146,6206,6259,6325,6387,6450,6497,6552,6640,6698,6760,6812,6862,6907,6950,7010,7077,7132,7187,7240,7287,7340,7396,7444,7499,7552,7586,7670,7737,7801,7897,7971,8052,8141,8304,8448,8527,8602,8684,8743,8823,8903,8958,9080,9183,9224,9277,9334,9408,9473,9541,9627,9707,9776,9870,9929,9984,10046,10106,10216", + "endLines": "44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164", + "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,64,56,53,55,50,57,57,58,62,66,68,59,55,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "2261,2357,2440,2536,2605,2648,2700,2752,2801,2864,2902,2949,3013,3071,3122,3206,3300,3408,3479,3563,3646,3712,3795,3897,3958,4020,4071,4149,4202,4262,4367,4426,4528,4593,4650,4704,4760,4811,4869,4927,4986,5049,5116,5185,5245,5301,5356,5427,5476,5534,5581,5640,5697,5768,5829,5886,5936,5988,6041,6091,6141,6201,6254,6320,6382,6445,6492,6547,6635,6693,6755,6807,6857,6902,6945,7005,7072,7127,7182,7235,7282,7335,7391,7439,7494,7547,7581,7665,7732,7796,7892,7966,8047,8136,8299,8443,8522,8597,8679,8738,8818,8898,8953,9075,9178,9219,9272,9329,9403,9468,9536,9622,9702,9771,9865,9924,9979,10041,10101,10211,10301" +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 } }, { @@ -61,12 +118,18 @@ { "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\arrays.xml", "from": { +<<<<<<< HEAD "startLines": "10,18", "startColumns": "4,4", "startOffsets": "237,524", "endLines": "15,21", "endColumns": "19,19", "endOffsets": "492,639" +======= + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" +>>>>>>> a }, "to": { "startLines": "2,8", @@ -80,6 +143,7 @@ { "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\colors.xml", "from": { +<<<<<<< HEAD "startLines": "17,19,18,23,27,29,28,38,40,36,34,33,37,24,25,32,30,31,39,26,20,21,42,43,16", "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", "startOffsets": "388,515,451,711,931,1045,991,1504,1614,1398,1323,1269,1451,764,823,1215,1103,1158,1558,878,574,632,1688,1741,331", @@ -87,11 +151,245 @@ "endOffsets": "434,557,498,759,986,1098,1040,1553,1662,1446,1371,1318,1499,818,873,1264,1153,1210,1609,926,614,672,1736,1794,383" }, "to": { +======= +<<<<<<< HEAD + "startLines": "71,49,55,66,61,15,20,25,31,37,10,43", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2752,1798,2043,2507,2299,421,628,837,1066,1314,215,1560", + "endLines": "75,52,58,69,63,18,23,28,34,40,13,46", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "3025,2001,2249,2720,2454,599,808,1017,1264,1515,393,1756" + }, + "to": { + "startLines": "130,135,139,143,147,150,154,158,162,166,170,174", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8364,8642,8850,9061,9226,9386,9569,9754,9939,10142,10348,10531", + "endLines": "134,138,142,146,149,153,157,161,165,169,173,177", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8637,8845,9056,9221,9381,9564,9749,9934,10137,10343,10526,10727" +======= + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "165,170,174,178,182,185,189,193,197,201,205,209", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "10306,10584,10792,11003,11168,11328,11511,11696,11881,12084,12290,12473", + "endLines": "169,173,177,181,184,188,192,196,200,204,208,212", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "10579,10787,10998,11163,11323,11506,11691,11876,12079,12285,12468,12669" +>>>>>>> a + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\dimens.xml", + "from": { +<<<<<<< HEAD + "startLines": "15,17,19,21,13", + "startColumns": "4,4,4,4,4", + "startOffsets": "335,409,484,558,262", + "endColumns": "51,52,52,51,51", + "endOffsets": "382,457,532,605,309" + }, + "to": { + "startLines": "18,19,20,21,22", + "startColumns": "4,4,4,4,4", + "startOffsets": "717,769,822,875,927", + "endColumns": "51,52,52,51,51", + "endOffsets": "764,817,870,922,974" +======= + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "35,36,37,38,39", + "startColumns": "4,4,4,4,4", + "startOffsets": "1651,1703,1756,1809,1861", + "endColumns": "51,52,52,51,51", + "endOffsets": "1698,1751,1804,1856,1908" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "map": [ + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml", + "from": { +======= +>>>>>>> a + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594", + "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,56", + "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1646" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "40,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164", + "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "1913,2266,2362,2445,2541,2610,2653,2705,2757,2806,2869,2907,2954,3018,3076,3127,3211,3305,3413,3484,3568,3651,3717,3800,3902,3963,4025,4076,4154,4207,4267,4372,4431,4533,4598,4655,4709,4765,4816,4874,4932,4991,5054,5121,5190,5250,5306,5361,5432,5481,5539,5586,5645,5702,5773,5834,5891,5941,5993,6046,6096,6146,6206,6259,6325,6387,6450,6497,6552,6640,6698,6760,6812,6862,6907,6950,7010,7077,7132,7187,7240,7287,7340,7396,7444,7499,7552,7586,7670,7737,7801,7897,7971,8052,8141,8304,8448,8527,8602,8684,8743,8823,8903,8958,9080,9183,9224,9277,9334,9408,9473,9541,9627,9707,9776,9870,9929,9984,10046,10106,10216", + "endLines": "44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164", + "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,64,56,53,55,50,57,57,58,62,66,68,59,55,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "2261,2357,2440,2536,2605,2648,2700,2752,2801,2864,2902,2949,3013,3071,3122,3206,3300,3408,3479,3563,3646,3712,3795,3897,3958,4020,4071,4149,4202,4262,4367,4426,4528,4593,4650,4704,4760,4811,4869,4927,4986,5049,5116,5185,5245,5301,5356,5427,5476,5534,5581,5640,5697,5768,5829,5886,5936,5988,6041,6091,6141,6201,6254,6320,6382,6445,6492,6547,6635,6693,6755,6807,6857,6902,6945,7005,7072,7127,7182,7235,7282,7335,7391,7439,7494,7547,7581,7665,7732,7796,7892,7966,8047,8136,8299,8443,8522,8597,8679,8738,8818,8898,8953,9075,9178,9219,9272,9329,9403,9468,9536,9622,9702,9771,9865,9924,9979,10041,10101,10211,10301" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-1,76,-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,4,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,3030,-1,-1,2507,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "-1,82,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,12,-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,3432,-1,-1,2720,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "165,170,177,181,185,189,192,196,200,204,208,212,216", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "10306,10584,10991,11199,11410,11575,11735,11918,12103,12288,12491,12697,12880", + "endLines": "169,176,180,184,188,191,195,199,203,207,211,215,219", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "10579,10986,11194,11405,11570,11730,11913,12098,12283,12486,12692,12875,13076" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "35,36,37,38,39", + "startColumns": "4,4,4,4,4", + "startOffsets": "1651,1703,1756,1809,1861", + "endColumns": "51,52,52,51,51", + "endOffsets": "1698,1751,1804,1856,1908" +>>>>>>> a + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "map": [ + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,43,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1688,1741,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,57,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1736,1794,-1" + }, + "to": { +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36", "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", "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594,1647,1705", "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,52,57,56", "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1642,1700,1757" +<<<<<<< HEAD +======= + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "155,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "9351,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9063,9253,-1,-1,-1,-1,9106,-1,9200,9300,9151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "159,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "9755,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9101,9295,-1,-1,-1,-1,9146,-1,9248,9346,9195,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "42,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172", + "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2024,2377,2473,2556,2652,2721,2764,2816,2868,2917,2980,3018,3065,3129,3187,3238,3322,3416,3524,3595,3679,3762,3828,3911,4013,4074,4136,4187,4265,4308,4355,4408,4468,4573,4632,4677,4779,4832,4883,4932,4997,5054,5108,5164,5215,5273,5331,5390,5453,5520,5589,5649,5705,5760,5831,5880,5938,5985,6044,6101,6172,6233,6290,6340,6392,6445,6495,6545,6605,6658,6724,6786,6849,6896,6951,7039,7097,7159,7211,7261,7306,7349,7409,7476,7531,7586,7639,7686,7739,7795,7843,7898,7951,7985,8069,8136,8200,8296,8370,8451,8540,8703,8847,8926,9001,9083,9142,9222,9302,9357,9479,9582,9623,9676,9733,9807,9872,9940,10026,10106,10175,10269,10328,10383,10445,10505,10615", + "endLines": "46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172", + "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,42,46,52,59,104,58,44,101,52,50,48,64,56,53,55,50,57,57,58,62,66,68,59,55,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "2372,2468,2551,2647,2716,2759,2811,2863,2912,2975,3013,3060,3124,3182,3233,3317,3411,3519,3590,3674,3757,3823,3906,4008,4069,4131,4182,4260,4303,4350,4403,4463,4568,4627,4672,4774,4827,4878,4927,4992,5049,5103,5159,5210,5268,5326,5385,5448,5515,5584,5644,5700,5755,5826,5875,5933,5980,6039,6096,6167,6228,6285,6335,6387,6440,6490,6540,6600,6653,6719,6781,6844,6891,6946,7034,7092,7154,7206,7256,7301,7344,7404,7471,7526,7581,7634,7681,7734,7790,7838,7893,7946,7980,8064,8131,8195,8291,8365,8446,8535,8698,8842,8921,8996,9078,9137,9217,9297,9352,9474,9577,9618,9671,9728,9802,9867,9935,10021,10101,10170,10264,10323,10378,10440,10500,10610,10700" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "173,178,185,189,193,197,200,204,208,212,216,220,224", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "10705,10983,11390,11598,11809,11974,12134,12317,12502,12687,12890,13096,13279", + "endLines": "177,184,188,192,196,199,203,207,211,215,219,223,227", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "10978,11385,11593,11804,11969,12129,12312,12497,12682,12885,13091,13274,13475" + } + }, + { + "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "37,38,39,40,41", + "startColumns": "4,4,4,4,4", + "startOffsets": "1762,1814,1867,1920,1972", + "endColumns": "51,52,52,51,51", + "endOffsets": "1809,1862,1915,1967,2019" +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 } } ] diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 0a75a5d..844137a 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,33 +1,57 @@ [ { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" }, { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" }, { "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" }, { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable_ic_lock_outline.xml.flat", "source": "net.micode.notes.app-main-7:/drawable/ic_lock_outline.xml" }, { "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_text_color_state_list.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\text_color_state_list.xml" +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 }, { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_gesture_panel_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\gesture_panel_background.xml" +>>>>>>> a + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" + }, + { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" +>>>>>>> a }, { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable_gesture_background.xml.flat", "source": "net.micode.notes.app-main-7:/drawable/gesture_background.xml" }, @@ -36,54 +60,145 @@ "source": "net.micode.notes.app-main-7:/drawable/ic_delete.xml" }, { +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" + }, + { +<<<<<<< HEAD +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 "merged": "net.micode.notes.app-merged_res-5:/drawable_toast_background.xml.flat", "source": "net.micode.notes.app-main-7:/drawable/toast_background.xml" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_button_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\button_background.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png" +>>>>>>> a }, { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" + }, + { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" }, { "merged": "net.micode.notes.app-merged_res-5:/layout_activity_register.xml.flat", "source": "net.micode.notes.app-main-7:/layout/activity_register.xml" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw/introduction" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" }, { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_warning.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_warning.png" +>>>>>>> a + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" + }, + { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" +>>>>>>> a }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" }, { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" }, { "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", - "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_add_user.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_add_user.xml" }, { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" +>>>>>>> a + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_bold.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_bold.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" + }, + { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" }, @@ -94,16 +209,34 @@ { "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/preferences.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png" +>>>>>>> a }, { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" + }, + { +<<<<<<< HEAD +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" }, @@ -118,92 +251,239 @@ { "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" +======= +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_italic.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_italic.xml" + }, + { +>>>>>>> a + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_gesture_verify.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_gesture_verify.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_strikethrough.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_strikethrough.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" +>>>>>>> a + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_item_user.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\item_user.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list.xml" }, { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_audio.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_audio.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" + }, + { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" }, { "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_bullet.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_bullet.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" }, { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" +>>>>>>> a + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" + }, + { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_delete.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_delete.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" +>>>>>>> a }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" }, { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_layout_custom_toast.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\layout_custom_toast.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" +>>>>>>> a }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_activity_register.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\activity_register.xml" }, { +<<<<<<< HEAD +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", "source": "net.micode.notes.app-main-7:/menu/note_list.xml" }, { "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" +======= +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_lock_outline.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_lock_outline.xml" + }, + { +>>>>>>> a + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png" +>>>>>>> a }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" }, { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" }, { "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_activity_user_management.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\activity_user_management.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" +>>>>>>> a }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml" }, { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" }, @@ -422,20 +702,30 @@ { "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" +>>>>>>> a }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" }, { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable_ic_format_bullet.xml.flat", "source": "net.micode.notes.app-main-7:/drawable/ic_format_bullet.xml" }, { "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 }, { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" }, @@ -470,13 +760,134 @@ { "merged": "net.micode.notes.app-merged_res-5:/layout_activity_login.xml.flat", "source": "net.micode.notes.app-main-7:/layout/activity_login.xml" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_gesture_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\gesture_background.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_toast_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\toast_background.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_color.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_color.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edittext_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edittext_background.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_gesture_password.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_gesture_password.xml" +>>>>>>> a }, { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" + }, + { +<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" +======= + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_underline.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_underline.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_activity_login.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\activity_login.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_gesture_button_background.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\gesture_button_background.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png" +>>>>>>> a } ] \ No newline at end of file diff --git a/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt b/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt index a80891c..2fda940 100644 --- a/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -3,6 +3,43 @@ int array menu_share_ways 0x7f010001 int color background_color 0x7f020000 int color button_color 0x7f020001 int color button_text_color 0x7f020002 +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +int color hint_color 0x7f020003 +int color primary_text_dark 0x7f020004 +int color secondary_text_dark 0x7f020005 +int color text_color 0x7f020006 +int color text_color_state_list 0x7f020007 +int color user_query_highlight 0x7f020008 +======= +int color gesture_background 0x7f02000b +int color gesture_button_background 0x7f02000c +int color gesture_button_ripple 0x7f02000d +int color gesture_button_text 0x7f02000e +int color gesture_error_color 0x7f02000f +int color gesture_hint_color 0x7f020010 +int color gesture_icon_color 0x7f020011 +int color gesture_line_error 0x7f020012 +int color gesture_line_normal 0x7f020013 +int color gesture_link_color 0x7f020014 +int color gesture_panel_background 0x7f020015 +int color gesture_panel_border 0x7f020016 +int color gesture_point_error 0x7f020017 +int color gesture_point_normal 0x7f020018 +int color gesture_point_selected 0x7f020019 +int color gesture_success_color 0x7f02001a +int color gesture_text_color 0x7f02001b +int color hint_color 0x7f020003 +int color primary_text_dark 0x7f020005 +int color secondary_text_dark 0x7f020007 +int color text_color 0x7f020008 +int color text_color_state_list 0x7f020009 +int color user_query_highlight 0x7f02000a +>>>>>>> a +======= +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 int color gesture_background 0x7f020003 int color gesture_button_background 0x7f020004 int color gesture_button_ripple 0x7f020005 @@ -28,6 +65,10 @@ int color text_color_state_list 0x7f020018 int color toolbar_background 0x7f020019 int color toolbar_button_selected 0x7f02001a int color user_query_highlight 0x7f02001b +<<<<<<< HEAD +======= +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 int dimen text_font_size_large 0x7f030000 int dimen text_font_size_medium 0x7f030001 int dimen text_font_size_normal 0x7f030002 @@ -56,6 +97,67 @@ int drawable font_normal 0x7f040013 int drawable font_size_selector_bg 0x7f040014 int drawable font_small 0x7f040015 int drawable font_super 0x7f040016 +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +int drawable ic_audio 0x7f040017 +======= +int drawable gesture_background 0x7f040047 +int drawable gesture_button_background 0x7f040048 +int drawable gesture_panel_background 0x7f040049 +int drawable ic_audio 0x7f040017 +int drawable ic_lock_outline 0x7f04004a +>>>>>>> a +int drawable ic_warning 0x7f040018 +int drawable icon_app 0x7f040019 +int drawable list_background 0x7f04001a +int drawable list_blue_down 0x7f04001b +int drawable list_blue_middle 0x7f04001c +int drawable list_blue_single 0x7f04001d +int drawable list_blue_up 0x7f04001e +int drawable list_folder 0x7f04001f +int drawable list_footer_bg 0x7f040020 +int drawable list_green_down 0x7f040021 +int drawable list_green_middle 0x7f040022 +int drawable list_green_single 0x7f040023 +int drawable list_green_up 0x7f040024 +int drawable list_red_down 0x7f040025 +int drawable list_red_middle 0x7f040026 +int drawable list_red_single 0x7f040027 +int drawable list_red_up 0x7f040028 +int drawable list_white_down 0x7f040029 +int drawable list_white_middle 0x7f04002a +int drawable list_white_single 0x7f04002b +int drawable list_white_up 0x7f04002c +int drawable list_yellow_down 0x7f04002d +int drawable list_yellow_middle 0x7f04002e +int drawable list_yellow_single 0x7f04002f +int drawable list_yellow_up 0x7f040030 +int drawable menu_delete 0x7f040031 +int drawable menu_move 0x7f040032 +int drawable new_note 0x7f040033 +int drawable new_note_normal 0x7f040034 +int drawable new_note_pressed 0x7f040035 +int drawable note_edit_color_selector_panel 0x7f040036 +int drawable notification 0x7f040037 +int drawable search_result 0x7f040038 +int drawable selected 0x7f040039 +int drawable title_alert 0x7f04003a +int drawable title_bar_bg 0x7f04003b +int drawable toast_background 0x7f04003c +int drawable widget_2x_blue 0x7f04003d +int drawable widget_2x_green 0x7f04003e +int drawable widget_2x_red 0x7f04003f +int drawable widget_2x_white 0x7f040040 +int drawable widget_2x_yellow 0x7f040041 +int drawable widget_4x_blue 0x7f040042 +int drawable widget_4x_green 0x7f040043 +int drawable widget_4x_red 0x7f040044 +int drawable widget_4x_white 0x7f040045 +int drawable widget_4x_yellow 0x7f040046 +======= +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 int drawable gesture_background 0x7f040017 int drawable gesture_button_background 0x7f040018 int drawable gesture_panel_background 0x7f040019 @@ -115,6 +217,10 @@ int drawable widget_4x_green 0x7f04004e int drawable widget_4x_red 0x7f04004f int drawable widget_4x_white 0x7f040050 int drawable widget_4x_yellow 0x7f040051 +<<<<<<< HEAD +======= +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 int id account_dialog_subtitle 0x7f050000 int id account_dialog_title 0x7f050001 int id action_select_all 0x7f050002 @@ -123,6 +229,7 @@ int id amPm 0x7f050004 int id btnBackToLogin 0x7f050005 int id btnLogin 0x7f050006 int id btnRegister 0x7f050007 +<<<<<<< HEAD int id btn_add_user 0x7f050008 int id btn_bold 0x7f050009 int id btn_bullet 0x7f05000a @@ -224,6 +331,293 @@ int id widget_text 0x7f050069 int layout account_dialog_title 0x7f060000 int layout activity_login 0x7f060001 int layout activity_register 0x7f060002 +======= +<<<<<<< HEAD +<<<<<<< HEAD +int id btn_logout 0x7f050008 +int id btn_new_note 0x7f050009 +int id btn_set_bg_color 0x7f05000a +int id cb_edit_item 0x7f05000b +int id date 0x7f05000c +int id delete 0x7f05000d +int id etLoginPassword 0x7f05000e +int id etLoginUsername 0x7f05000f +int id etPassword 0x7f050010 +int id etUsername 0x7f050011 +int id et_edit_text 0x7f050012 +int id et_foler_name 0x7f050013 +int id font_size_selector 0x7f050014 +int id hour 0x7f050015 +int id imageView 0x7f050016 +int id iv_alert_icon 0x7f050017 +int id iv_bg_blue 0x7f050018 +int id iv_bg_blue_select 0x7f050019 +int id iv_bg_green 0x7f05001a +int id iv_bg_green_select 0x7f05001b +int id iv_bg_red 0x7f05001c +int id iv_bg_red_select 0x7f05001d +int id iv_bg_white 0x7f05001e +int id iv_bg_white_select 0x7f05001f +int id iv_bg_yellow 0x7f050020 +int id iv_bg_yellow_select 0x7f050021 +int id iv_large_select 0x7f050022 +int id iv_medium_select 0x7f050023 +int id iv_small_select 0x7f050024 +int id iv_super_select 0x7f050025 +int id ll_font_large 0x7f050026 +int id ll_font_normal 0x7f050027 +int id ll_font_small 0x7f050028 +int id ll_font_super 0x7f050029 +int id menu_alert 0x7f05002a +int id menu_delete 0x7f05002b +int id menu_delete_remind 0x7f05002c +int id menu_export_text 0x7f05002d +int id menu_font_size 0x7f05002e +int id menu_list_mode 0x7f05002f +int id menu_new_folder 0x7f050030 +int id menu_new_note 0x7f050031 +int id menu_search 0x7f050032 +int id menu_send_to_desktop 0x7f050033 +int id menu_setting 0x7f050034 +int id menu_share 0x7f050035 +int id menu_sync 0x7f050036 +int id minute 0x7f050037 +int id move 0x7f050038 +int id navigation_bar 0x7f050039 +int id note_bg_color_selector 0x7f05003a +int id note_edit_list 0x7f05003b +int id note_edit_view 0x7f05003c +int id note_item 0x7f05003d +int id note_title 0x7f05003e +int id notes_list 0x7f05003f +int id prefenerece_sync_status_textview 0x7f050040 +int id preference_sync_button 0x7f050041 +int id record_audio_btn 0x7f050042 +int id selection_menu 0x7f050043 +int id speech_to_text_btn 0x7f050044 +int id sv_note_edit 0x7f050045 +int id textView 0x7f050046 +int id tv_alert_date 0x7f050047 +int id tv_folder_name 0x7f050048 +int id tv_modified_date 0x7f050049 +int id tv_name 0x7f05004a +int id tv_time 0x7f05004b +int id tv_title 0x7f05004c +int id tv_title_bar 0x7f05004d +int id widget_bg_image 0x7f05004e +int id widget_text 0x7f05004f +======= +int id btn_confirm 0x7f050008 +int id btn_logout 0x7f050009 +int id btn_new_note 0x7f05000a +int id btn_set_bg_color 0x7f05000b +int id cb_edit_item 0x7f05000c +int id date 0x7f05000d +int id delete 0x7f05000e +int id etLoginPassword 0x7f05000f +int id etLoginUsername 0x7f050010 +int id etPassword 0x7f050011 +int id etUsername 0x7f050012 +int id et_edit_text 0x7f050013 +int id et_foler_name 0x7f050014 +int id font_size_selector 0x7f050015 +int id gesture_status 0x7f050017 +int id hour 0x7f050018 +int id imageView 0x7f050019 +int id iv_alert_icon 0x7f05001a +int id iv_bg_blue 0x7f05001b +int id iv_bg_blue_select 0x7f05001c +int id iv_bg_green 0x7f05001d +int id iv_bg_green_select 0x7f05001e +int id iv_bg_red 0x7f05001f +int id iv_bg_red_select 0x7f050020 +int id iv_bg_white 0x7f050021 +int id iv_bg_white_select 0x7f050022 +int id iv_bg_yellow 0x7f050023 +int id iv_bg_yellow_select 0x7f050024 +int id iv_large_select 0x7f050025 +int id iv_lock_icon 0x7f050055 +int id iv_medium_select 0x7f050026 +int id iv_small_select 0x7f050027 +int id iv_super_select 0x7f050028 +int id ll_font_large 0x7f050029 +int id ll_font_normal 0x7f05002a +int id ll_font_small 0x7f05002b +int id ll_font_super 0x7f05002c +int id lock_pattern_view 0x7f050054 +int id menu_alert 0x7f05002d +int id menu_delete 0x7f05002e +int id menu_delete_remind 0x7f05002f +int id menu_export_text 0x7f050030 +int id menu_font_size 0x7f050031 +int id menu_list_mode 0x7f050032 +int id menu_new_folder 0x7f050033 +int id menu_new_note 0x7f050034 +int id menu_search 0x7f050035 +int id menu_send_to_desktop 0x7f050036 +int id menu_set_gesture 0x7f050053 +int id menu_setting 0x7f050037 +int id menu_share 0x7f050038 +int id menu_sync 0x7f050039 +int id minute 0x7f05003a +int id move 0x7f05003b +int id navigation_bar 0x7f05003c +int id note_bg_color_selector 0x7f05003d +int id note_edit_list 0x7f05003e +int id note_edit_view 0x7f05003f +int id note_item 0x7f050040 +int id note_title 0x7f050041 +int id notes_list 0x7f050042 +int id prefenerece_sync_status_textview 0x7f050043 +int id preference_sync_button 0x7f050044 +int id record_audio_btn 0x7f050045 +int id selection_menu 0x7f050046 +int id speech_to_text_btn 0x7f050047 +int id sv_note_edit 0x7f050048 +int id textView 0x7f050049 +int id tv_alert_date 0x7f05004a +int id tv_folder_name 0x7f05004b +int id tv_forgot_pattern 0x7f050056 +int id tv_modified_date 0x7f05004c +int id tv_name 0x7f05004d +int id tv_time 0x7f05004e +int id tv_title 0x7f05004f +int id tv_title_bar 0x7f050050 +int id widget_bg_image 0x7f050051 +int id widget_text 0x7f050052 +>>>>>>> a +int layout account_dialog_title 0x7f060000 +int layout activity_login 0x7f060001 +int layout activity_register 0x7f060002 +int layout add_account_text 0x7f060003 +int layout datetime_picker 0x7f060004 +int layout dialog_edit_text 0x7f060005 +int layout folder_list_item 0x7f060006 +int layout layout_custom_toast 0x7f060007 +int layout note_edit 0x7f060008 +int layout note_edit_list_item 0x7f060009 +<<<<<<< HEAD +int layout note_item 0x7f06000a +int layout note_list 0x7f06000b +int layout note_list_dropdown_menu 0x7f06000c +int layout note_list_footer 0x7f06000d +int layout settings_header 0x7f06000e +int layout widget_2x 0x7f06000f +int layout widget_4x 0x7f060010 +======= +int layout note_gesture_password 0x7f06000a +int layout note_gesture_verify 0x7f060012 +int layout note_item 0x7f06000b +int layout note_list 0x7f06000c +int layout note_list_dropdown_menu 0x7f06000d +int layout note_list_footer 0x7f06000e +int layout settings_header 0x7f06000f +int layout widget_2x 0x7f060010 +int layout widget_4x 0x7f060011 +>>>>>>> a +======= +int id btn_add_user 0x7f050008 +int id btn_bold 0x7f050009 +int id btn_bullet 0x7f05000a +int id btn_confirm 0x7f05000b +int id btn_confirm_add_user 0x7f05000c +int id btn_delete_image 0x7f05000d +int id btn_delete_user 0x7f05000e +int id btn_italic 0x7f05000f +int id btn_logout 0x7f050010 +int id btn_new_note 0x7f050011 +int id btn_set_bg_color 0x7f050012 +int id btn_strikethrough 0x7f050013 +int id btn_text_color 0x7f050014 +int id btn_underline 0x7f050015 +int id cb_edit_item 0x7f050016 +int id date 0x7f050017 +int id delete 0x7f050018 +int id dialog_title 0x7f050019 +int id etLoginPassword 0x7f05001a +int id etLoginUsername 0x7f05001b +int id etPassword 0x7f05001c +int id etUsername 0x7f05001d +int id et_edit_text 0x7f05001e +int id et_foler_name 0x7f05001f +int id font_size_selector 0x7f050020 +int id gesture_status 0x7f050021 +int id hour 0x7f050022 +int id imageView 0x7f050023 +int id input_password 0x7f050024 +int id input_username 0x7f050025 +int id iv_alert_icon 0x7f050026 +int id iv_bg_blue 0x7f050027 +int id iv_bg_blue_select 0x7f050028 +int id iv_bg_green 0x7f050029 +int id iv_bg_green_select 0x7f05002a +int id iv_bg_red 0x7f05002b +int id iv_bg_red_select 0x7f05002c +int id iv_bg_white 0x7f05002d +int id iv_bg_white_select 0x7f05002e +int id iv_bg_yellow 0x7f05002f +int id iv_bg_yellow_select 0x7f050030 +int id iv_large_select 0x7f050031 +int id iv_lock_icon 0x7f050032 +int id iv_medium_select 0x7f050033 +int id iv_small_select 0x7f050034 +int id iv_super_select 0x7f050035 +int id list_view_users 0x7f050036 +int id ll_font_large 0x7f050037 +int id ll_font_normal 0x7f050038 +int id ll_font_small 0x7f050039 +int id ll_font_super 0x7f05003a +int id lock_pattern_view 0x7f05003b +int id menu_alert 0x7f05003c +int id menu_delete 0x7f05003d +int id menu_delete_remind 0x7f05003e +int id menu_export_text 0x7f05003f +int id menu_font_size 0x7f050040 +int id menu_list_mode 0x7f050041 +int id menu_manage_users 0x7f050042 +int id menu_new_folder 0x7f050043 +int id menu_new_note 0x7f050044 +int id menu_search 0x7f050045 +int id menu_send_to_desktop 0x7f050046 +int id menu_set_gesture 0x7f050047 +int id menu_setting 0x7f050048 +int id menu_share 0x7f050049 +int id menu_sync 0x7f05004a +int id minute 0x7f05004b +int id move 0x7f05004c +int id navigation_bar 0x7f05004d +int id note_bg_color_selector 0x7f05004e +int id note_edit_list 0x7f05004f +int id note_edit_view 0x7f050050 +int id note_item 0x7f050051 +int id note_title 0x7f050052 +int id notes_list 0x7f050053 +int id prefenerece_sync_status_textview 0x7f050054 +int id preference_sync_button 0x7f050055 +int id record_audio_btn 0x7f050056 +int id selection_menu 0x7f050057 +int id speech_to_text_btn 0x7f050058 +int id sv_note_edit 0x7f050059 +int id textView 0x7f05005a +int id text_username 0x7f05005b +int id title_user_management 0x7f05005c +int id toolbar 0x7f05005d +int id tvLoginTitle 0x7f05005e +int id tvRegisterTitle 0x7f05005f +int id tv_alert_date 0x7f050060 +int id tv_folder_name 0x7f050061 +int id tv_forgot_pattern 0x7f050062 +int id tv_modified_date 0x7f050063 +int id tv_name 0x7f050064 +int id tv_time 0x7f050065 +int id tv_title 0x7f050066 +int id tv_title_bar 0x7f050067 +int id widget_bg_image 0x7f050068 +int id widget_text 0x7f050069 +int layout account_dialog_title 0x7f060000 +int layout activity_login 0x7f060001 +int layout activity_register 0x7f060002 +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 int layout activity_user_management 0x7f060003 int layout add_account_text 0x7f060004 int layout datetime_picker 0x7f060005 @@ -243,6 +637,10 @@ int layout note_list_footer 0x7f060012 int layout settings_header 0x7f060013 int layout widget_2x 0x7f060014 int layout widget_4x 0x7f060015 +<<<<<<< HEAD +======= +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 int menu call_note_edit 0x7f070000 int menu call_record_folder 0x7f070001 int menu note_edit 0x7f070002 @@ -261,6 +659,349 @@ int string app_widget2x2 0x7f0a0005 int string app_widget4x4 0x7f0a0006 int string button_delete 0x7f0a0007 int string call_record_folder_name 0x7f0a0008 +<<<<<<< HEAD +int string cancel 0x7f0a0009 +int string confirm_gesture 0x7f0a000a +int string confirm_gesture_pattern 0x7f0a000b +int string datetime_dialog_cancel 0x7f0a000c +int string datetime_dialog_ok 0x7f0a000d +int string delete_remind_time_message 0x7f0a000e +int string error_note_empty_for_clock 0x7f0a000f +int string error_note_empty_for_send_to_desktop 0x7f0a0010 +int string error_note_not_exist 0x7f0a0011 +int string error_sdcard_export 0x7f0a0012 +int string error_sdcard_unmounted 0x7f0a0013 +int string error_sync_cancelled 0x7f0a0014 +int string error_sync_internal 0x7f0a0015 +int string error_sync_network 0x7f0a0016 +int string failed_sdcard_export 0x7f0a0017 +int string file_name_txt_format 0x7f0a0018 +int string file_path 0x7f0a0019 +int string folder_exist 0x7f0a001a +int string format_bold 0x7f0a001b +int string format_bullet 0x7f0a001c +int string format_date_ymd 0x7f0a001d +int string format_datetime_mdhm 0x7f0a001e +int string format_exported_file_location 0x7f0a001f +int string format_folder_files_count 0x7f0a0020 +int string format_italic 0x7f0a0021 +int string format_move_notes_to_folder 0x7f0a0022 +int string format_strikethrough 0x7f0a0023 +int string format_text_color 0x7f0a0024 +int string format_underline 0x7f0a0025 +int string gesture_forgot_message 0x7f0a0026 +int string gesture_forgot_pattern 0x7f0a0027 +int string gesture_forgot_title 0x7f0a0028 +int string gesture_instruction 0x7f0a0029 +int string gesture_matched 0x7f0a002a +int string gesture_not_matched 0x7f0a002b +int string gesture_password_set 0x7f0a002c +int string gesture_too_short 0x7f0a002d +int string gesture_verify_error 0x7f0a002e +int string gesture_verify_fail_max 0x7f0a002f +int string gesture_verify_fail_tries 0x7f0a0030 +int string gesture_verify_hint 0x7f0a0031 +int string gesture_verify_success 0x7f0a0032 +int string hint_foler_name 0x7f0a0033 +int string info_note_enter_desktop 0x7f0a0034 +int string menu_alert 0x7f0a0035 +int string menu_create_folder 0x7f0a0036 +int string menu_delete 0x7f0a0037 +int string menu_deselect_all 0x7f0a0038 +int string menu_export_text 0x7f0a0039 +int string menu_folder_change_name 0x7f0a003a +int string menu_folder_delete 0x7f0a003b +int string menu_folder_view 0x7f0a003c +int string menu_font_large 0x7f0a003d +int string menu_font_normal 0x7f0a003e +int string menu_font_size 0x7f0a003f +int string menu_font_small 0x7f0a0040 +int string menu_font_super 0x7f0a0041 +int string menu_list_mode 0x7f0a0042 +int string menu_move 0x7f0a0043 +int string menu_move_parent_folder 0x7f0a0044 +int string menu_normal_mode 0x7f0a0045 +int string menu_remove_remind 0x7f0a0046 +int string menu_search 0x7f0a0047 +int string menu_select_all 0x7f0a0048 +int string menu_select_none 0x7f0a0049 +int string menu_select_title 0x7f0a004a +int string menu_send_to_desktop 0x7f0a004b +int string menu_set_gesture 0x7f0a004c +int string menu_setting 0x7f0a004d +int string menu_share 0x7f0a004e +int string menu_sync 0x7f0a004f +int string menu_sync_cancel 0x7f0a0050 +int string menu_title_select_folder 0x7f0a0051 +int string note_alert_expired 0x7f0a0052 +int string note_link_email 0x7f0a0053 +int string note_link_other 0x7f0a0054 +int string note_link_tel 0x7f0a0055 +int string note_link_web 0x7f0a0056 +int string notealert_enter 0x7f0a0057 +int string notealert_ok 0x7f0a0058 +int string notelist_menu_new 0x7f0a0059 +int string notelist_string_info 0x7f0a005a +int string ok 0x7f0a005b +int string preferences_account_summary 0x7f0a005c +int string preferences_account_title 0x7f0a005d +int string preferences_add_account 0x7f0a005e +int string preferences_bg_random_appear_title 0x7f0a005f +int string preferences_button_sync_cancel 0x7f0a0060 +int string preferences_button_sync_immediately 0x7f0a0061 +int string preferences_dialog_change_account_title 0x7f0a0062 +int string preferences_dialog_change_account_warn_msg 0x7f0a0063 +int string preferences_dialog_select_account_tips 0x7f0a0064 +int string preferences_dialog_select_account_title 0x7f0a0065 +int string preferences_last_sync_time 0x7f0a0066 +int string preferences_last_sync_time_format 0x7f0a0067 +int string preferences_menu_cancel 0x7f0a0068 +int string preferences_menu_change_account 0x7f0a0069 +int string preferences_menu_remove_account 0x7f0a006a +int string preferences_title 0x7f0a006b +int string preferences_toast_cannot_change_account 0x7f0a006c +int string preferences_toast_success_set_accout 0x7f0a006d +int string search 0x7f0a006e +int string search_hint 0x7f0a006f +int string search_label 0x7f0a0070 +int string search_setting_description 0x7f0a0071 +int string set_remind_time_message 0x7f0a0072 +int string success_sdcard_export 0x7f0a0073 +int string success_sync_account 0x7f0a0074 +int string sync_progress_init_list 0x7f0a0075 +int string sync_progress_login 0x7f0a0076 +int string sync_progress_syncing 0x7f0a0077 +int string ticker_cancel 0x7f0a0078 +int string ticker_fail 0x7f0a0079 +int string ticker_success 0x7f0a007a +int string ticker_syncing 0x7f0a007b +int string widget_havenot_content 0x7f0a007c +int string widget_under_visit_mode 0x7f0a007d +int style CustomEditTextStyle 0x7f0b0000 +======= +<<<<<<< HEAD +<<<<<<< HEAD +int string datetime_dialog_cancel 0x7f0a0009 +int string datetime_dialog_ok 0x7f0a000a +int string delete_remind_time_message 0x7f0a000b +int string error_note_empty_for_clock 0x7f0a000c +int string error_note_empty_for_send_to_desktop 0x7f0a000d +int string error_note_not_exist 0x7f0a000e +int string error_sdcard_export 0x7f0a000f +int string error_sdcard_unmounted 0x7f0a0010 +int string error_sync_cancelled 0x7f0a0011 +int string error_sync_internal 0x7f0a0012 +int string error_sync_network 0x7f0a0013 +int string failed_sdcard_export 0x7f0a0014 +int string file_name_txt_format 0x7f0a0015 +int string file_path 0x7f0a0016 +int string folder_exist 0x7f0a0017 +int string format_date_ymd 0x7f0a0018 +int string format_datetime_mdhm 0x7f0a0019 +int string format_exported_file_location 0x7f0a001a +int string format_folder_files_count 0x7f0a001b +int string format_move_notes_to_folder 0x7f0a001c +int string hint_foler_name 0x7f0a001d +int string info_note_enter_desktop 0x7f0a001e +int string menu_alert 0x7f0a001f +int string menu_create_folder 0x7f0a0020 +int string menu_delete 0x7f0a0021 +int string menu_deselect_all 0x7f0a0022 +int string menu_export_text 0x7f0a0023 +int string menu_folder_change_name 0x7f0a0024 +int string menu_folder_delete 0x7f0a0025 +int string menu_folder_view 0x7f0a0026 +int string menu_font_large 0x7f0a0027 +int string menu_font_normal 0x7f0a0028 +int string menu_font_size 0x7f0a0029 +int string menu_font_small 0x7f0a002a +int string menu_font_super 0x7f0a002b +int string menu_list_mode 0x7f0a002c +int string menu_move 0x7f0a002d +int string menu_move_parent_folder 0x7f0a002e +int string menu_normal_mode 0x7f0a002f +int string menu_remove_remind 0x7f0a0030 +int string menu_search 0x7f0a0031 +int string menu_select_all 0x7f0a0032 +int string menu_select_none 0x7f0a0033 +int string menu_select_title 0x7f0a0034 +int string menu_send_to_desktop 0x7f0a0035 +int string menu_setting 0x7f0a0036 +int string menu_share 0x7f0a0037 +int string menu_sync 0x7f0a0038 +int string menu_sync_cancel 0x7f0a0039 +int string menu_title_select_folder 0x7f0a003a +int string note_alert_expired 0x7f0a003b +int string note_link_email 0x7f0a003c +int string note_link_other 0x7f0a003d +int string note_link_tel 0x7f0a003e +int string note_link_web 0x7f0a003f +int string notealert_enter 0x7f0a0040 +int string notealert_ok 0x7f0a0041 +int string notelist_menu_new 0x7f0a0042 +int string notelist_string_info 0x7f0a0043 +int string preferences_account_summary 0x7f0a0044 +int string preferences_account_title 0x7f0a0045 +int string preferences_add_account 0x7f0a0046 +int string preferences_bg_random_appear_title 0x7f0a0047 +int string preferences_button_sync_cancel 0x7f0a0048 +int string preferences_button_sync_immediately 0x7f0a0049 +int string preferences_dialog_change_account_title 0x7f0a004a +int string preferences_dialog_change_account_warn_msg 0x7f0a004b +int string preferences_dialog_select_account_tips 0x7f0a004c +int string preferences_dialog_select_account_title 0x7f0a004d +int string preferences_last_sync_time 0x7f0a004e +int string preferences_last_sync_time_format 0x7f0a004f +int string preferences_menu_cancel 0x7f0a0050 +int string preferences_menu_change_account 0x7f0a0051 +int string preferences_menu_remove_account 0x7f0a0052 +int string preferences_title 0x7f0a0053 +int string preferences_toast_cannot_change_account 0x7f0a0054 +int string preferences_toast_success_set_accout 0x7f0a0055 +int string search 0x7f0a0056 +int string search_hint 0x7f0a0057 +int string search_label 0x7f0a0058 +int string search_setting_description 0x7f0a0059 +int string set_remind_time_message 0x7f0a005a +int string success_sdcard_export 0x7f0a005b +int string success_sync_account 0x7f0a005c +int string sync_progress_init_list 0x7f0a005d +int string sync_progress_login 0x7f0a005e +int string sync_progress_syncing 0x7f0a005f +int string ticker_cancel 0x7f0a0060 +int string ticker_fail 0x7f0a0061 +int string ticker_success 0x7f0a0062 +int string ticker_syncing 0x7f0a0063 +int string widget_havenot_content 0x7f0a0064 +int string widget_under_visit_mode 0x7f0a0065 +int style CustomEditTextStyle 0x7f0b0000 +======= +int string cancel 0x7f0a0071 +int string confirm_gesture 0x7f0a0009 +int string confirm_gesture_pattern 0x7f0a000a +int string datetime_dialog_cancel 0x7f0a000b +int string datetime_dialog_ok 0x7f0a000c +int string delete_remind_time_message 0x7f0a000d +int string error_note_empty_for_clock 0x7f0a000e +int string error_note_empty_for_send_to_desktop 0x7f0a000f +int string error_note_not_exist 0x7f0a0010 +int string error_sdcard_export 0x7f0a0011 +int string error_sdcard_unmounted 0x7f0a0012 +int string error_sync_cancelled 0x7f0a0013 +int string error_sync_internal 0x7f0a0014 +int string error_sync_network 0x7f0a0015 +int string failed_sdcard_export 0x7f0a0016 +int string file_name_txt_format 0x7f0a0017 +int string file_path 0x7f0a0018 +int string folder_exist 0x7f0a0019 +int string format_date_ymd 0x7f0a001a +int string format_datetime_mdhm 0x7f0a001b +int string format_exported_file_location 0x7f0a001c +int string format_folder_files_count 0x7f0a001d +int string format_move_notes_to_folder 0x7f0a001e +int string gesture_forgot_message 0x7f0a0072 +int string gesture_forgot_pattern 0x7f0a0073 +int string gesture_forgot_title 0x7f0a0074 +int string gesture_instruction 0x7f0a001f +int string gesture_matched 0x7f0a0020 +int string gesture_not_matched 0x7f0a0021 +int string gesture_password_set 0x7f0a0022 +int string gesture_too_short 0x7f0a0023 +int string gesture_verify_error 0x7f0a0075 +int string gesture_verify_fail_max 0x7f0a006e +int string gesture_verify_fail_tries 0x7f0a006f +int string gesture_verify_hint 0x7f0a0070 +int string gesture_verify_success 0x7f0a0076 +int string hint_foler_name 0x7f0a0024 +int string info_note_enter_desktop 0x7f0a0025 +int string menu_alert 0x7f0a0026 +int string menu_create_folder 0x7f0a0027 +int string menu_delete 0x7f0a0028 +int string menu_deselect_all 0x7f0a0029 +int string menu_export_text 0x7f0a002a +int string menu_folder_change_name 0x7f0a002b +int string menu_folder_delete 0x7f0a002c +int string menu_folder_view 0x7f0a002d +int string menu_font_large 0x7f0a002e +int string menu_font_normal 0x7f0a002f +int string menu_font_size 0x7f0a0030 +int string menu_font_small 0x7f0a0031 +int string menu_font_super 0x7f0a0032 +int string menu_list_mode 0x7f0a0033 +int string menu_move 0x7f0a0034 +int string menu_move_parent_folder 0x7f0a0035 +int string menu_normal_mode 0x7f0a0036 +int string menu_remove_remind 0x7f0a0037 +int string menu_search 0x7f0a0038 +int string menu_select_all 0x7f0a0039 +int string menu_select_none 0x7f0a003a +int string menu_select_title 0x7f0a003b +int string menu_send_to_desktop 0x7f0a003c +int string menu_set_gesture 0x7f0a003d +int string menu_setting 0x7f0a003e +int string menu_share 0x7f0a003f +int string menu_sync 0x7f0a0040 +int string menu_sync_cancel 0x7f0a0041 +int string menu_title_select_folder 0x7f0a0042 +int string note_alert_expired 0x7f0a0043 +int string note_link_email 0x7f0a0044 +int string note_link_other 0x7f0a0045 +int string note_link_tel 0x7f0a0046 +int string note_link_web 0x7f0a0047 +int string notealert_enter 0x7f0a0048 +int string notealert_ok 0x7f0a0049 +int string notelist_menu_new 0x7f0a004a +int string notelist_string_info 0x7f0a004b +int string ok 0x7f0a0077 +int string preferences_account_summary 0x7f0a004c +int string preferences_account_title 0x7f0a004d +int string preferences_add_account 0x7f0a004e +int string preferences_bg_random_appear_title 0x7f0a004f +int string preferences_button_sync_cancel 0x7f0a0050 +int string preferences_button_sync_immediately 0x7f0a0051 +int string preferences_dialog_change_account_title 0x7f0a0052 +int string preferences_dialog_change_account_warn_msg 0x7f0a0053 +int string preferences_dialog_select_account_tips 0x7f0a0054 +int string preferences_dialog_select_account_title 0x7f0a0055 +int string preferences_last_sync_time 0x7f0a0056 +int string preferences_last_sync_time_format 0x7f0a0057 +int string preferences_menu_cancel 0x7f0a0058 +int string preferences_menu_change_account 0x7f0a0059 +int string preferences_menu_remove_account 0x7f0a005a +int string preferences_title 0x7f0a005b +int string preferences_toast_cannot_change_account 0x7f0a005c +int string preferences_toast_success_set_accout 0x7f0a005d +int string search 0x7f0a005e +int string search_hint 0x7f0a005f +int string search_label 0x7f0a0060 +int string search_setting_description 0x7f0a0061 +int string set_remind_time_message 0x7f0a0062 +int string success_sdcard_export 0x7f0a0063 +int string success_sync_account 0x7f0a0064 +int string sync_progress_init_list 0x7f0a0065 +int string sync_progress_login 0x7f0a0066 +int string sync_progress_syncing 0x7f0a0067 +int string ticker_cancel 0x7f0a0068 +int string ticker_fail 0x7f0a0069 +int string ticker_success 0x7f0a006a +int string ticker_syncing 0x7f0a006b +int string widget_havenot_content 0x7f0a006c +int string widget_under_visit_mode 0x7f0a006d +int style CustomEditTextStyle 0x7f0b0000 +int style GestureVerifyTheme 0x7f0b000c +>>>>>>> a +int style HighlightTextAppearancePrimary 0x7f0b0001 +int style HighlightTextAppearanceSecondary 0x7f0b0002 +int style NoteActionBarStyle 0x7f0b0003 +int style NoteTheme 0x7f0b0004 +int style TextAppearanceLarge 0x7f0b0005 +int style TextAppearanceMedium 0x7f0b0006 +int style TextAppearanceNormal 0x7f0b0007 +int style TextAppearancePrimaryItem 0x7f0b0008 +int style TextAppearanceSecondaryItem 0x7f0b0009 +int style TextAppearanceSuper 0x7f0b000a +int style TextAppearanceUnderMenuIcon 0x7f0b000b +======= int string cancel 0x7f0a0009 int string confirm_gesture 0x7f0a000a int string confirm_gesture_pattern 0x7f0a000b @@ -379,6 +1120,7 @@ int string ticker_syncing 0x7f0a007b int string widget_havenot_content 0x7f0a007c int string widget_under_visit_mode 0x7f0a007d int style CustomEditTextStyle 0x7f0b0000 +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 int style GestureVerifyTheme 0x7f0b0001 int style HighlightTextAppearancePrimary 0x7f0b0002 int style HighlightTextAppearanceSecondary 0x7f0b0003 @@ -391,6 +1133,10 @@ int style TextAppearancePrimaryItem 0x7f0b0009 int style TextAppearanceSecondaryItem 0x7f0b000a int style TextAppearanceSuper 0x7f0b000b int style TextAppearanceUnderMenuIcon 0x7f0b000c +<<<<<<< HEAD +======= +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 int xml preferences 0x7f0c0000 int xml searchable 0x7f0c0001 int xml widget_2x_info 0x7f0c0002 diff --git a/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt index dff1812..446cb75 100644 --- a/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\github\XiaoMiNote\Src\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\github\XiaoMiNote\Src\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\github\XiaoMiNote\Src\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\github\XiaoMiNote\Src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\github\XiaoMiNote\Src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\github\XiaoMiNote\Src\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\github\XiaoMiNote\Src\app\src\debug\res -net.micode.notes.app-main-7 D:\github\XiaoMiNote\Src\app\src\main\res +net.micode.notes.app-pngs-0 D:\gitnote\notes\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\gitnote\notes\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\gitnote\notes\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\gitnote\notes\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\gitnote\notes\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\gitnote\notes\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\gitnote\notes\app\src\debug\res +net.micode.notes.app-main-7 D:\gitnote\notes\app\src\main\res diff --git a/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index dd029b8..59c2fc7 100644 --- a/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,3 +1,4 @@ +<<<<<<< HEAD net.micode.notes:xml/preferences = 0x7f0c0000 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b000a net.micode.notes:style/TextAppearanceNormal = 0x7f0b0008 @@ -71,6 +72,111 @@ net.micode.notes:string/delete_remind_time_message = 0x7f0a000e net.micode.notes:string/datetime_dialog_ok = 0x7f0a000d net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000c net.micode.notes:string/confirm_gesture = 0x7f0a000a +======= +net.micode.notes:layout/activity_user_management = 0x7f060013 +net.micode.notes:id/menu_manage_users = 0x7f050063 +net.micode.notes:id/list_view_users = 0x7f050062 +net.micode.notes:id/input_username = 0x7f050061 +net.micode.notes:id/input_password = 0x7f050060 +net.micode.notes:id/btn_add_user = 0x7f05005e +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a0022 +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0006 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0060 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0069 +net.micode.notes:style/NoteActionBarStyle = 0x7f0b0004 +net.micode.notes:string/menu_create_folder = 0x7f0a0036 +net.micode.notes:id/menu_share = 0x7f050041 +net.micode.notes:layout/layout_custom_toast = 0x7f060007 +<<<<<<< HEAD +net.micode.notes:color/gesture_button_ripple = 0x7f02000d +net.micode.notes:string/gesture_verify_error = 0x7f0a0075 +net.micode.notes:string/gesture_verify_fail_tries = 0x7f0a006f +net.micode.notes:id/tv_forgot_pattern = 0x7f050056 +net.micode.notes:string/format_folder_files_count = 0x7f0a001d +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0055 +net.micode.notes:string/ticker_success = 0x7f0a006a +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a005a +net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0001 +net.micode.notes:string/menu_sync = 0x7f0a0040 +net.micode.notes:color/gesture_background = 0x7f02000b +net.micode.notes:color/gesture_button_text = 0x7f02000e +net.micode.notes:color/gesture_hint_color = 0x7f020010 +net.micode.notes:color/gesture_panel_border = 0x7f020016 +net.micode.notes:string/success_sdcard_export = 0x7f0a0063 +net.micode.notes:string/notelist_string_info = 0x7f0a004b +net.micode.notes:string/menu_move_parent_folder = 0x7f0a0035 +net.micode.notes:string/confirm_gesture = 0x7f0a0009 +net.micode.notes:xml/preferences = 0x7f0c0000 +<<<<<<< HEAD +net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0009 +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0007 +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0005 +net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0001 +net.micode.notes:string/widget_havenot_content = 0x7f0a0064 +net.micode.notes:string/ticker_syncing = 0x7f0a0063 +net.micode.notes:string/ticker_success = 0x7f0a0062 +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0002 +net.micode.notes:string/ticker_cancel = 0x7f0a0060 +net.micode.notes:string/sync_progress_syncing = 0x7f0a005f +net.micode.notes:string/sync_progress_init_list = 0x7f0a005d +net.micode.notes:string/search_label = 0x7f0a0058 +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 +net.micode.notes:string/preferences_title = 0x7f0a0053 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 +net.micode.notes:style/NoteActionBarStyle = 0x7f0b0003 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 +net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 +net.micode.notes:string/preferences_account_summary = 0x7f0a0044 +net.micode.notes:string/success_sdcard_export = 0x7f0a005b +net.micode.notes:string/notelist_string_info = 0x7f0a0043 +net.micode.notes:string/notelist_menu_new = 0x7f0a0042 +net.micode.notes:string/notealert_ok = 0x7f0a0041 +net.micode.notes:string/notealert_enter = 0x7f0a0040 +net.micode.notes:string/note_link_web = 0x7f0a003f +net.micode.notes:string/note_link_tel = 0x7f0a003e +net.micode.notes:string/note_link_other = 0x7f0a003d +net.micode.notes:string/note_link_email = 0x7f0a003c +net.micode.notes:string/note_alert_expired = 0x7f0a003b +net.micode.notes:string/menu_sync = 0x7f0a0038 +net.micode.notes:string/menu_share = 0x7f0a0037 +net.micode.notes:string/menu_select_title = 0x7f0a0034 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0006 +net.micode.notes:string/menu_select_none = 0x7f0a0033 +net.micode.notes:string/menu_search = 0x7f0a0031 +net.micode.notes:string/menu_remove_remind = 0x7f0a0030 +net.micode.notes:string/menu_normal_mode = 0x7f0a002f +net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e +net.micode.notes:string/menu_move = 0x7f0a002d +net.micode.notes:string/menu_list_mode = 0x7f0a002c +net.micode.notes:string/menu_font_small = 0x7f0a002a +net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 +net.micode.notes:string/menu_export_text = 0x7f0a0023 +net.micode.notes:string/menu_deselect_all = 0x7f0a0022 +net.micode.notes:string/menu_create_folder = 0x7f0a0020 +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c +net.micode.notes:string/format_folder_files_count = 0x7f0a001b +net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 +net.micode.notes:string/format_date_ymd = 0x7f0a0018 +net.micode.notes:string/file_path = 0x7f0a0016 +net.micode.notes:string/ticker_fail = 0x7f0a0061 +net.micode.notes:string/file_name_txt_format = 0x7f0a0015 +net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 +net.micode.notes:string/set_remind_time_message = 0x7f0a005a +net.micode.notes:string/error_sync_network = 0x7f0a0013 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 +net.micode.notes:string/error_note_not_exist = 0x7f0a000e +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c +net.micode.notes:string/delete_remind_time_message = 0x7f0a000b +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 net.micode.notes:string/app_widget4x4 = 0x7f0a0006 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 net.micode.notes:string/app_name = 0x7f0a0004 @@ -161,6 +267,7 @@ net.micode.notes:id/iv_large_select = 0x7f050031 net.micode.notes:id/widget_bg_image = 0x7f050068 net.micode.notes:id/iv_bg_green_select = 0x7f05002a net.micode.notes:id/amPm = 0x7f050004 +<<<<<<< HEAD net.micode.notes:id/iv_bg_green = 0x7f050029 net.micode.notes:layout/settings_header = 0x7f060013 net.micode.notes:drawable/new_note_pressed = 0x7f040040 @@ -182,6 +289,421 @@ net.micode.notes:id/etUsername = 0x7f05001d net.micode.notes:id/ll_font_small = 0x7f050039 net.micode.notes:id/etPassword = 0x7f05001c net.micode.notes:id/etLoginPassword = 0x7f05001a +======= +net.micode.notes:id/iv_bg_green = 0x7f05001a +net.micode.notes:id/iv_small_select = 0x7f050024 +net.micode.notes:menu/note_list_options = 0x7f070005 +net.micode.notes:style/NoteTheme = 0x7f0b0004 +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040036 +net.micode.notes:id/hour = 0x7f050015 +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c +net.micode.notes:id/font_size_selector = 0x7f050014 +net.micode.notes:id/et_edit_text = 0x7f050012 +net.micode.notes:drawable/list_white_single = 0x7f04002b +net.micode.notes:layout/note_item = 0x7f06000a +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0008 +net.micode.notes:string/hint_foler_name = 0x7f0a001d +net.micode.notes:string/folder_exist = 0x7f0a0017 +net.micode.notes:id/etUsername = 0x7f050011 +net.micode.notes:id/ll_font_small = 0x7f050028 +net.micode.notes:id/etPassword = 0x7f050010 +net.micode.notes:id/etLoginUsername = 0x7f05000f +net.micode.notes:id/etLoginPassword = 0x7f05000e +net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000b +net.micode.notes:id/delete = 0x7f05000d +net.micode.notes:id/et_foler_name = 0x7f050013 +net.micode.notes:drawable/edit_green = 0x7f040008 +net.micode.notes:layout/widget_4x = 0x7f060010 +net.micode.notes:string/search = 0x7f0a0056 +net.micode.notes:id/cb_edit_item = 0x7f05000b +net.micode.notes:id/btn_set_bg_color = 0x7f05000a +net.micode.notes:color/button_text_color = 0x7f020002 +net.micode.notes:id/imageView = 0x7f050016 +net.micode.notes:id/btnRegister = 0x7f050007 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a +net.micode.notes:drawable/menu_move = 0x7f040032 +net.micode.notes:drawable/widget_4x_white = 0x7f040045 +net.micode.notes:id/btnLogin = 0x7f050006 +======= +net.micode.notes:id/iv_bg_white = 0x7f050021 +net.micode.notes:drawable/gesture_background = 0x7f040047 +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000c +net.micode.notes:string/sync_progress_init_list = 0x7f0a0065 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0058 +net.micode.notes:color/gesture_point_error = 0x7f020017 +net.micode.notes:string/notelist_menu_new = 0x7f0a004a +net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0009 +net.micode.notes:drawable/ic_lock_outline = 0x7f04004a +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001e +net.micode.notes:string/menu_remove_remind = 0x7f0a0037 +net.micode.notes:string/gesture_forgot_pattern = 0x7f0a0073 +net.micode.notes:layout/note_list = 0x7f06000c +net.micode.notes:color/gesture_error_color = 0x7f02000f +net.micode.notes:drawable/gesture_panel_background = 0x7f040049 +net.micode.notes:string/ticker_syncing = 0x7f0a006b +net.micode.notes:style/GestureVerifyTheme = 0x7f0b000c +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000f +net.micode.notes:id/lock_pattern_view = 0x7f050054 +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a0053 +net.micode.notes:color/gesture_button_background = 0x7f02000c +net.micode.notes:string/preferences_last_sync_time = 0x7f0a0056 +net.micode.notes:color/gesture_text_color = 0x7f02001b +net.micode.notes:color/gesture_point_selected = 0x7f020019 +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000b +net.micode.notes:string/search_label = 0x7f0a0060 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0006 +net.micode.notes:string/menu_select_none = 0x7f0a003a +net.micode.notes:id/menu_send_to_desktop = 0x7f050036 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a006d +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a005d +net.micode.notes:style/NoteActionBarStyle = 0x7f0b0003 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0059 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a005c +net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 +net.micode.notes:string/menu_normal_mode = 0x7f0a0036 +net.micode.notes:drawable/title_alert = 0x7f04003a +net.micode.notes:id/note_title = 0x7f050041 +net.micode.notes:string/menu_search = 0x7f0a0038 +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0007 +net.micode.notes:string/preferences_title = 0x7f0a005b +net.micode.notes:string/delete_remind_time_message = 0x7f0a000d +net.micode.notes:string/widget_havenot_content = 0x7f0a006c +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0051 +net.micode.notes:id/notes_list = 0x7f050042 +net.micode.notes:layout/note_edit = 0x7f060008 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0050 +net.micode.notes:string/preferences_account_summary = 0x7f0a004c +net.micode.notes:color/gesture_line_error = 0x7f020012 +net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:string/menu_share = 0x7f0a003f +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0002 +net.micode.notes:string/ticker_cancel = 0x7f0a0068 +net.micode.notes:string/ok = 0x7f0a0077 +net.micode.notes:string/notealert_ok = 0x7f0a0049 +net.micode.notes:string/app_widget4x4 = 0x7f0a0006 +net.micode.notes:string/note_link_web = 0x7f0a0047 +net.micode.notes:id/tv_time = 0x7f05004e +net.micode.notes:drawable/widget_2x_blue = 0x7f04003d +net.micode.notes:string/sync_progress_syncing = 0x7f0a0067 +net.micode.notes:id/btn_confirm = 0x7f050008 +net.micode.notes:string/menu_deselect_all = 0x7f0a0029 +net.micode.notes:string/note_link_email = 0x7f0a0044 +net.micode.notes:string/menu_export_text = 0x7f0a002a +net.micode.notes:string/note_alert_expired = 0x7f0a0043 +net.micode.notes:string/note_link_other = 0x7f0a0045 +net.micode.notes:string/file_path = 0x7f0a0018 +net.micode.notes:layout/activity_login = 0x7f060001 +net.micode.notes:xml/widget_4x_info = 0x7f0c0003 +net.micode.notes:string/menu_set_gesture = 0x7f0a003d +net.micode.notes:id/menu_search = 0x7f050035 +net.micode.notes:color/gesture_icon_color = 0x7f020011 +net.micode.notes:id/tv_name = 0x7f05004d +net.micode.notes:string/menu_move = 0x7f0a0034 +net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:string/menu_list_mode = 0x7f0a0033 +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000e +net.micode.notes:id/iv_bg_blue_select = 0x7f05001c +net.micode.notes:id/menu_share = 0x7f050038 +net.micode.notes:string/menu_create_folder = 0x7f0a0027 +net.micode.notes:string/format_datetime_mdhm = 0x7f0a001b +net.micode.notes:string/format_date_ymd = 0x7f0a001a +net.micode.notes:string/notealert_enter = 0x7f0a0048 +net.micode.notes:drawable/new_note = 0x7f040033 +net.micode.notes:id/sv_note_edit = 0x7f050048 +net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 +net.micode.notes:layout/datetime_picker = 0x7f060004 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:string/menu_font_small = 0x7f0a0031 +net.micode.notes:string/gesture_not_matched = 0x7f0a0021 +net.micode.notes:string/failed_sdcard_export = 0x7f0a0016 +net.micode.notes:string/menu_folder_change_name = 0x7f0a002b +net.micode.notes:string/set_remind_time_message = 0x7f0a0062 +net.micode.notes:string/error_sync_network = 0x7f0a0015 +net.micode.notes:string/error_note_not_exist = 0x7f0a0010 +net.micode.notes:id/menu_new_folder = 0x7f050033 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0012 +net.micode.notes:id/speech_to_text_btn = 0x7f050047 +net.micode.notes:string/app_widget2x2 = 0x7f0a0005 +net.micode.notes:string/menu_select_title = 0x7f0a003b +net.micode.notes:string/app_name = 0x7f0a0004 +net.micode.notes:string/alert_title_delete = 0x7f0a0003 +net.micode.notes:raw/introduction = 0x7f090000 +net.micode.notes:string/menu_font_normal = 0x7f0a002f +net.micode.notes:string/format_exported_file_location = 0x7f0a001c +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0005 +net.micode.notes:drawable/new_note_pressed = 0x7f040035 +net.micode.notes:id/iv_bg_blue = 0x7f05001b +net.micode.notes:layout/settings_header = 0x7f06000f +net.micode.notes:menu/call_note_edit = 0x7f070000 +net.micode.notes:style/TextAppearanceSuper = 0x7f0b000a +net.micode.notes:color/secondary_text_dark = 0x7f020007 +net.micode.notes:id/move = 0x7f05003b +net.micode.notes:id/iv_bg_yellow_select = 0x7f050024 +net.micode.notes:string/note_link_tel = 0x7f0a0046 +net.micode.notes:id/widget_text = 0x7f050052 +net.micode.notes:layout/note_list_footer = 0x7f06000e +net.micode.notes:id/btn_new_note = 0x7f05000a +net.micode.notes:string/menu_font_super = 0x7f0a0032 +net.micode.notes:id/textView = 0x7f050049 +net.micode.notes:id/preference_sync_button = 0x7f050044 +net.micode.notes:string/error_sdcard_export = 0x7f0a0011 +net.micode.notes:drawable/font_normal = 0x7f040013 +net.micode.notes:id/minute = 0x7f05003a +net.micode.notes:drawable/font_super = 0x7f040016 +net.micode.notes:id/menu_sync = 0x7f050039 +net.micode.notes:id/menu_setting = 0x7f050037 +net.micode.notes:string/gesture_forgot_message = 0x7f0a0072 +net.micode.notes:id/menu_new_note = 0x7f050034 +net.micode.notes:drawable/list_green_down = 0x7f040021 +net.micode.notes:id/menu_list_mode = 0x7f050032 +net.micode.notes:id/iv_medium_select = 0x7f050026 +net.micode.notes:id/menu_export_text = 0x7f050030 +net.micode.notes:string/menu_folder_view = 0x7f0a002d +net.micode.notes:id/menu_delete = 0x7f05002e +net.micode.notes:layout/activity_register = 0x7f060002 +net.micode.notes:drawable/edit_blue = 0x7f040007 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050043 +net.micode.notes:string/file_name_txt_format = 0x7f0a0017 +net.micode.notes:string/ticker_fail = 0x7f0a0069 +net.micode.notes:id/gesture_status = 0x7f050017 +net.micode.notes:id/menu_alert = 0x7f05002d +net.micode.notes:string/menu_font_size = 0x7f0a0030 +net.micode.notes:drawable/edit_title_yellow = 0x7f04000e +net.micode.notes:string/menu_alert = 0x7f0a0026 +net.micode.notes:id/record_audio_btn = 0x7f050045 +net.micode.notes:id/date = 0x7f05000d +net.micode.notes:id/ll_font_super = 0x7f05002c +net.micode.notes:string/success_sync_account = 0x7f0a0064 +net.micode.notes:id/etLoginPassword = 0x7f05000f +net.micode.notes:id/ll_font_normal = 0x7f05002a +net.micode.notes:menu/call_record_folder = 0x7f070001 +net.micode.notes:id/ll_font_large = 0x7f050029 +net.micode.notes:id/note_bg_color_selector = 0x7f05003d +net.micode.notes:id/iv_super_select = 0x7f050028 +net.micode.notes:drawable/search_result = 0x7f040038 +net.micode.notes:id/iv_bg_yellow = 0x7f050023 +net.micode.notes:string/error_sync_cancelled = 0x7f0a0013 +net.micode.notes:id/iv_bg_white_select = 0x7f050022 +net.micode.notes:drawable/widget_4x_blue = 0x7f040042 +net.micode.notes:id/iv_large_select = 0x7f050025 +net.micode.notes:string/menu_font_large = 0x7f0a002e +net.micode.notes:id/iv_bg_green_select = 0x7f05001e +net.micode.notes:id/widget_bg_image = 0x7f050051 +net.micode.notes:color/primary_color = 0x7f020004 +net.micode.notes:id/amPm = 0x7f050004 +net.micode.notes:id/iv_bg_green = 0x7f05001d +net.micode.notes:menu/note_list_options = 0x7f070005 +net.micode.notes:id/iv_small_select = 0x7f050027 +net.micode.notes:id/hour = 0x7f050018 +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040036 +net.micode.notes:style/NoteTheme = 0x7f0b0004 +net.micode.notes:id/font_size_selector = 0x7f050015 +net.micode.notes:color/secondary_color = 0x7f020006 +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0054 +net.micode.notes:layout/note_gesture_verify = 0x7f060012 +net.micode.notes:id/et_edit_text = 0x7f050013 +net.micode.notes:layout/note_item = 0x7f06000b +net.micode.notes:drawable/list_white_single = 0x7f04002b +net.micode.notes:id/etUsername = 0x7f050012 +net.micode.notes:string/hint_foler_name = 0x7f0a0024 +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0008 +net.micode.notes:string/folder_exist = 0x7f0a0019 +net.micode.notes:id/ll_font_small = 0x7f05002b +net.micode.notes:id/etPassword = 0x7f050011 +net.micode.notes:id/etLoginUsername = 0x7f050010 +net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000b +net.micode.notes:id/delete = 0x7f05000e +net.micode.notes:id/btn_set_bg_color = 0x7f05000b +net.micode.notes:color/button_text_color = 0x7f020002 +net.micode.notes:id/imageView = 0x7f050019 +net.micode.notes:drawable/button_background = 0x7f040002 +net.micode.notes:id/btn_logout = 0x7f050009 +net.micode.notes:id/btnRegister = 0x7f050007 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a0052 +net.micode.notes:drawable/menu_move = 0x7f040032 +net.micode.notes:id/btnLogin = 0x7f050006 +net.micode.notes:drawable/widget_4x_white = 0x7f040045 +>>>>>>> a +net.micode.notes:id/account_dialog_subtitle = 0x7f050000 +net.micode.notes:id/iv_bg_blue_select = 0x7f050019 +net.micode.notes:menu/note_list = 0x7f070003 +net.micode.notes:id/account_dialog_title = 0x7f050001 +<<<<<<< HEAD +net.micode.notes:drawable/widget_4x_green = 0x7f040043 +net.micode.notes:drawable/widget_2x_yellow = 0x7f040041 +net.micode.notes:dimen/text_font_size_large = 0x7f030000 +net.micode.notes:id/tv_alert_date = 0x7f050047 +net.micode.notes:drawable/widget_2x_red = 0x7f04003f +net.micode.notes:drawable/widget_2x_green = 0x7f04003e +net.micode.notes:drawable/title_bar_bg = 0x7f04003b +net.micode.notes:id/iv_bg_red = 0x7f05001c +net.micode.notes:drawable/notification = 0x7f040037 +net.micode.notes:drawable/list_green_single = 0x7f040023 +net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 +net.micode.notes:id/tv_modified_date = 0x7f050049 +net.micode.notes:drawable/ic_warning = 0x7f040018 +net.micode.notes:drawable/list_blue_middle = 0x7f04001c +net.micode.notes:id/menu_delete_remind = 0x7f05002c +net.micode.notes:drawable/list_red_down = 0x7f040025 +net.micode.notes:drawable/list_red_middle = 0x7f040026 +net.micode.notes:string/menu_title_select_folder = 0x7f0a003a +net.micode.notes:string/menu_select_all = 0x7f0a0032 +net.micode.notes:drawable/toast_background = 0x7f04003c +net.micode.notes:xml/searchable = 0x7f0c0001 +net.micode.notes:string/menu_folder_delete = 0x7f0a0025 +net.micode.notes:drawable/dropdown_icon = 0x7f040006 +net.micode.notes:string/button_delete = 0x7f0a0007 +net.micode.notes:drawable/new_note_normal = 0x7f040034 +net.micode.notes:drawable/button_background = 0x7f040002 +net.micode.notes:id/btn_logout = 0x7f050008 +net.micode.notes:drawable/list_yellow_single = 0x7f04002f +net.micode.notes:id/tv_folder_name = 0x7f050048 +net.micode.notes:drawable/list_yellow_down = 0x7f04002d +net.micode.notes:drawable/clock = 0x7f040004 +net.micode.notes:drawable/list_white_up = 0x7f04002c +net.micode.notes:layout/dialog_edit_text = 0x7f060005 +net.micode.notes:string/preferences_account_title = 0x7f0a0045 +net.micode.notes:drawable/edit_white = 0x7f04000f +net.micode.notes:drawable/list_white_middle = 0x7f04002a +net.micode.notes:color/user_query_highlight = 0x7f020008 +net.micode.notes:color/text_color_state_list = 0x7f020007 +net.micode.notes:drawable/list_white_down = 0x7f040029 +net.micode.notes:drawable/widget_4x_yellow = 0x7f040046 +net.micode.notes:drawable/list_red_up = 0x7f040028 +net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000c +net.micode.notes:drawable/list_blue_down = 0x7f04001b +net.micode.notes:id/action_select_all = 0x7f050002 +net.micode.notes:drawable/list_green_middle = 0x7f040022 +net.micode.notes:string/menu_delete = 0x7f0a0021 +net.micode.notes:drawable/list_folder = 0x7f04001f +net.micode.notes:color/background_color = 0x7f020000 +net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 +net.micode.notes:drawable/list_red_single = 0x7f040027 +net.micode.notes:style/CustomEditTextStyle = 0x7f0b0000 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 +net.micode.notes:layout/widget_2x = 0x7f06000f +net.micode.notes:drawable/list_footer_bg = 0x7f040020 +net.micode.notes:string/preferences_add_account = 0x7f0a0046 +net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 +net.micode.notes:string/alert_title_delete = 0x7f0a0003 +net.micode.notes:drawable/edit_title_green = 0x7f04000b +net.micode.notes:drawable/icon_app = 0x7f040019 +net.micode.notes:drawable/font_small = 0x7f040015 +net.micode.notes:string/sync_progress_login = 0x7f0a005e +net.micode.notes:array/menu_share_ways = 0x7f010001 +======= +net.micode.notes:string/gesture_matched = 0x7f0a0020 +net.micode.notes:drawable/widget_4x_green = 0x7f040043 +net.micode.notes:dimen/text_font_size_large = 0x7f030000 +net.micode.notes:id/tv_alert_date = 0x7f05004a +net.micode.notes:drawable/widget_2x_red = 0x7f04003f +net.micode.notes:color/gesture_point_normal = 0x7f020018 +net.micode.notes:drawable/widget_2x_green = 0x7f04003e +net.micode.notes:drawable/title_bar_bg = 0x7f04003b +net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:dimen/text_font_size_super = 0x7f030004 +net.micode.notes:drawable/selected = 0x7f040039 +net.micode.notes:string/gesture_verify_fail_max = 0x7f0a006e +net.micode.notes:id/iv_bg_red = 0x7f05001f +net.micode.notes:drawable/notification = 0x7f040037 +net.micode.notes:id/tv_modified_date = 0x7f05004c +net.micode.notes:drawable/ic_warning = 0x7f040018 +net.micode.notes:drawable/list_blue_middle = 0x7f04001c +net.micode.notes:id/menu_delete_remind = 0x7f05002f +net.micode.notes:drawable/list_red_down = 0x7f040025 +net.micode.notes:drawable/list_red_middle = 0x7f040026 +net.micode.notes:drawable/gesture_button_background = 0x7f040048 +net.micode.notes:id/menu_set_gesture = 0x7f050053 +net.micode.notes:string/menu_title_select_folder = 0x7f0a0042 +net.micode.notes:string/menu_select_all = 0x7f0a0039 +net.micode.notes:drawable/toast_background = 0x7f04003c +net.micode.notes:xml/searchable = 0x7f0c0001 +net.micode.notes:string/menu_folder_delete = 0x7f0a002c +net.micode.notes:string/gesture_too_short = 0x7f0a0023 +net.micode.notes:drawable/dropdown_icon = 0x7f040006 +net.micode.notes:string/button_delete = 0x7f0a0007 +net.micode.notes:drawable/new_note_normal = 0x7f040034 +net.micode.notes:drawable/list_yellow_single = 0x7f04002f +net.micode.notes:id/tv_folder_name = 0x7f05004b +net.micode.notes:drawable/list_yellow_down = 0x7f04002d +net.micode.notes:color/gesture_line_normal = 0x7f020013 +net.micode.notes:layout/widget_4x = 0x7f060011 +net.micode.notes:id/et_foler_name = 0x7f050014 +net.micode.notes:drawable/edit_green = 0x7f040008 +net.micode.notes:drawable/clock = 0x7f040004 +net.micode.notes:drawable/list_white_up = 0x7f04002c +net.micode.notes:id/gesture_overlay = 0x7f050016 +net.micode.notes:layout/dialog_edit_text = 0x7f060005 +net.micode.notes:string/preferences_account_title = 0x7f0a004d +net.micode.notes:drawable/edit_white = 0x7f04000f +net.micode.notes:drawable/list_white_middle = 0x7f04002a +net.micode.notes:color/user_query_highlight = 0x7f02000a +net.micode.notes:color/text_color_state_list = 0x7f020009 +net.micode.notes:drawable/list_white_down = 0x7f040029 +net.micode.notes:drawable/widget_4x_yellow = 0x7f040046 +net.micode.notes:drawable/list_red_up = 0x7f040028 +net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000d +net.micode.notes:drawable/list_blue_down = 0x7f04001b +net.micode.notes:id/action_select_all = 0x7f050002 +net.micode.notes:drawable/list_green_middle = 0x7f040022 +net.micode.notes:string/menu_delete = 0x7f0a0028 +net.micode.notes:drawable/list_folder = 0x7f04001f +net.micode.notes:drawable/list_blue_up = 0x7f04001e +net.micode.notes:string/search_setting_description = 0x7f0a0061 +net.micode.notes:drawable/list_blue_single = 0x7f04001d +net.micode.notes:string/gesture_forgot_title = 0x7f0a0074 +net.micode.notes:drawable/widget_2x_yellow = 0x7f040041 +net.micode.notes:color/background_color = 0x7f020000 +net.micode.notes:string/menu_send_to_desktop = 0x7f0a003c +net.micode.notes:drawable/list_red_single = 0x7f040027 +net.micode.notes:style/CustomEditTextStyle = 0x7f0b0000 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004f +net.micode.notes:layout/widget_2x = 0x7f060010 +net.micode.notes:drawable/list_footer_bg = 0x7f040020 +net.micode.notes:string/preferences_add_account = 0x7f0a004e +net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 +net.micode.notes:drawable/edit_title_green = 0x7f04000b +net.micode.notes:drawable/icon_app = 0x7f040019 +net.micode.notes:drawable/font_small = 0x7f040015 +net.micode.notes:string/sync_progress_login = 0x7f0a0066 +net.micode.notes:array/menu_share_ways = 0x7f010001 +net.micode.notes:string/confirm_gesture_pattern = 0x7f0a000a +>>>>>>> a +net.micode.notes:color/hint_color = 0x7f020003 +net.micode.notes:drawable/widget_2x_white = 0x7f040040 +net.micode.notes:layout/folder_list_item = 0x7f060006 +net.micode.notes:layout/add_account_text = 0x7f060003 +<<<<<<< HEAD +net.micode.notes:id/tv_title = 0x7f05004c +net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 +net.micode.notes:drawable/ic_audio = 0x7f040017 +net.micode.notes:color/primary_text_dark = 0x7f020004 +net.micode.notes:drawable/font_size_selector_bg = 0x7f040014 +net.micode.notes:drawable/list_blue_up = 0x7f04001e +======= +net.micode.notes:color/gesture_success_color = 0x7f02001a +net.micode.notes:id/tv_title = 0x7f05004f +net.micode.notes:string/menu_sync_cancel = 0x7f0a0041 +net.micode.notes:drawable/ic_audio = 0x7f040017 +net.micode.notes:color/primary_text_dark = 0x7f020005 +net.micode.notes:drawable/font_size_selector_bg = 0x7f040014 +net.micode.notes:color/gesture_panel_background = 0x7f020015 +>>>>>>> a +net.micode.notes:drawable/widget_4x_red = 0x7f040044 +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 +net.micode.notes:drawable/list_green_up = 0x7f040024 +net.micode.notes:id/btnBackToLogin = 0x7f050005 +<<<<<<< HEAD +net.micode.notes:string/search_setting_description = 0x7f0a0059 +net.micode.notes:drawable/list_blue_single = 0x7f04001d +net.micode.notes:drawable/font_large = 0x7f040012 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f +net.micode.notes:id/note_edit_view = 0x7f05003c +net.micode.notes:drawable/edittext_background = 0x7f040011 +net.micode.notes:id/selection_menu = 0x7f050043 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:id/add_img_btn = 0x7f050003 +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 net.micode.notes:drawable/delete = 0x7f040005 net.micode.notes:drawable/edit_yellow = 0x7f040010 net.micode.notes:id/dialog_title = 0x7f050019 @@ -281,6 +803,7 @@ net.micode.notes:drawable/font_super = 0x7f040016 net.micode.notes:id/menu_sync = 0x7f05004a net.micode.notes:drawable/ic_format_underline = 0x7f040021 net.micode.notes:drawable/call_record = 0x7f040003 +<<<<<<< HEAD net.micode.notes:drawable/ic_lock_outline = 0x7f040022 net.micode.notes:string/menu_font_small = 0x7f0a0040 net.micode.notes:drawable/ic_format_strikethrough = 0x7f040020 @@ -371,6 +894,56 @@ net.micode.notes:id/tv_title = 0x7f050066 net.micode.notes:color/gesture_success_color = 0x7f020012 net.micode.notes:string/preferences_account_summary = 0x7f0a005c net.micode.notes:color/gesture_line_error = 0x7f02000a +======= +net.micode.notes:id/iv_bg_red_select = 0x7f05001d +net.micode.notes:string/error_sync_internal = 0x7f0a0012 +net.micode.notes:drawable/menu_delete = 0x7f040031 +net.micode.notes:string/search_hint = 0x7f0a0057 +net.micode.notes:id/menu_font_size = 0x7f05002e +net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 +======= +net.micode.notes:drawable/font_large = 0x7f040012 +net.micode.notes:id/selection_menu = 0x7f050046 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a0025 +net.micode.notes:id/add_img_btn = 0x7f050003 +net.micode.notes:drawable/delete = 0x7f040005 +net.micode.notes:drawable/edit_yellow = 0x7f040010 +net.micode.notes:id/note_item = 0x7f050040 +net.micode.notes:string/search = 0x7f0a005e +net.micode.notes:id/cb_edit_item = 0x7f05000c +net.micode.notes:drawable/edit_title_white = 0x7f04000d +net.micode.notes:id/note_edit_list = 0x7f05003e +net.micode.notes:id/iv_alert_icon = 0x7f05001a +net.micode.notes:drawable/edit_red = 0x7f040009 +net.micode.notes:drawable/edit_title_red = 0x7f04000c +net.micode.notes:drawable/edit_title_blue = 0x7f04000a +net.micode.notes:drawable/call_record = 0x7f040003 +net.micode.notes:drawable/list_yellow_up = 0x7f040030 +net.micode.notes:string/error_sync_internal = 0x7f0a0014 +net.micode.notes:drawable/menu_delete = 0x7f040031 +net.micode.notes:string/search_hint = 0x7f0a005f +net.micode.notes:id/menu_font_size = 0x7f050031 +net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 +net.micode.notes:string/cancel = 0x7f0a0071 +>>>>>>> a +net.micode.notes:dimen/text_font_size_small = 0x7f030003 +net.micode.notes:string/gesture_verify_hint = 0x7f0a0070 +net.micode.notes:dimen/text_font_size_normal = 0x7f030002 +<<<<<<< HEAD +======= +net.micode.notes:string/gesture_password_set = 0x7f0a0022 +>>>>>>> a +net.micode.notes:drawable/list_background = 0x7f04001a +net.micode.notes:menu/note_list_dropdown = 0x7f070004 +net.micode.notes:id/iv_lock_icon = 0x7f050055 +net.micode.notes:string/menu_setting = 0x7f0a003e +net.micode.notes:dimen/text_font_size_medium = 0x7f030001 +<<<<<<< HEAD +net.micode.notes:id/tv_title_bar = 0x7f05004d +net.micode.notes:color/text_color = 0x7f020006 +net.micode.notes:layout/note_edit_list_item = 0x7f060009 +net.micode.notes:layout/account_dialog_title = 0x7f060000 +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 net.micode.notes:array/format_for_exported_note = 0x7f010000 net.micode.notes:drawable/ic_format_bold = 0x7f04001c net.micode.notes:color/gesture_background = 0x7f020003 @@ -395,3 +968,397 @@ net.micode.notes:color/background_color = 0x7f020000 net.micode.notes:id/btn_add_user = 0x7f050008 net.micode.notes:drawable/list_yellow_middle = 0x7f040039 net.micode.notes:color/button_color = 0x7f020001 +======= +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0057 +net.micode.notes:id/note_edit_view = 0x7f05003f +net.micode.notes:drawable/edittext_background = 0x7f040011 +net.micode.notes:string/gesture_instruction = 0x7f0a001f +net.micode.notes:id/iv_bg_red_select = 0x7f050020 +net.micode.notes:id/tv_title_bar = 0x7f050050 +net.micode.notes:color/text_color = 0x7f020008 +net.micode.notes:id/navigation_bar = 0x7f05003c +======= +net.micode.notes:string/menu_move = 0x7f0a0043 +net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a006a +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a0063 +net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0002 +net.micode.notes:string/menu_sync = 0x7f0a004f +net.micode.notes:layout/dialog_edit_text = 0x7f060005 +net.micode.notes:string/sync_progress_syncing = 0x7f0a0077 +net.micode.notes:string/menu_deselect_all = 0x7f0a0038 +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0065 +net.micode.notes:string/format_folder_files_count = 0x7f0a0020 +net.micode.notes:string/delete_remind_time_message = 0x7f0a000e +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0008 +net.micode.notes:layout/add_account_text = 0x7f060003 +net.micode.notes:string/preferences_title = 0x7f0a006b +net.micode.notes:string/format_underline = 0x7f0a0025 +net.micode.notes:id/tv_folder_name = 0x7f050055 +net.micode.notes:string/search_label = 0x7f0a0070 +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000c +net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b000a +net.micode.notes:string/notelist_menu_new = 0x7f0a0059 +net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:string/menu_share = 0x7f0a004e +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0003 +net.micode.notes:string/ticker_cancel = 0x7f0a0078 +net.micode.notes:string/ok = 0x7f0a005b +net.micode.notes:string/notealert_ok = 0x7f0a0058 +net.micode.notes:string/app_widget4x4 = 0x7f0a0006 +net.micode.notes:string/note_link_web = 0x7f0a0056 +net.micode.notes:string/note_link_tel = 0x7f0a0055 +net.micode.notes:id/widget_text = 0x7f05005d +net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a006c +net.micode.notes:string/note_link_email = 0x7f0a0053 +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000f +net.micode.notes:string/menu_list_mode = 0x7f0a0042 +net.micode.notes:string/note_alert_expired = 0x7f0a0052 +net.micode.notes:string/note_link_other = 0x7f0a0054 +net.micode.notes:string/file_path = 0x7f0a0019 +net.micode.notes:string/format_strikethrough = 0x7f0a0023 +net.micode.notes:string/ticker_syncing = 0x7f0a007b +net.micode.notes:string/menu_export_text = 0x7f0a0039 +net.micode.notes:layout/activity_login = 0x7f060001 +net.micode.notes:layout/note_list = 0x7f06000d +net.micode.notes:string/menu_set_gesture = 0x7f0a004c +net.micode.notes:xml/widget_4x_info = 0x7f0c0003 +net.micode.notes:string/menu_normal_mode = 0x7f0a0045 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0007 +net.micode.notes:string/menu_select_none = 0x7f0a0049 +net.micode.notes:id/menu_send_to_desktop = 0x7f05003e +net.micode.notes:string/widget_under_visit_mode = 0x7f0a007d +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a006d +net.micode.notes:string/gesture_verify_fail_tries = 0x7f0a0030 +net.micode.notes:string/gesture_verify_error = 0x7f0a002e +net.micode.notes:id/btn_set_bg_color = 0x7f05000f +net.micode.notes:string/menu_folder_change_name = 0x7f0a003a +net.micode.notes:string/gesture_forgot_pattern = 0x7f0a0027 +net.micode.notes:string/menu_remove_remind = 0x7f0a0046 +net.micode.notes:string/menu_move_parent_folder = 0x7f0a0044 +net.micode.notes:string/format_italic = 0x7f0a0021 +net.micode.notes:string/success_sdcard_export = 0x7f0a0073 +net.micode.notes:string/notelist_string_info = 0x7f0a005a +net.micode.notes:string/format_datetime_mdhm = 0x7f0a001e +net.micode.notes:string/format_date_ymd = 0x7f0a001d +net.micode.notes:string/format_bullet = 0x7f0a001c +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000d +net.micode.notes:layout/note_edit = 0x7f060008 +net.micode.notes:id/notes_list = 0x7f05004b +net.micode.notes:string/widget_havenot_content = 0x7f0a007c +net.micode.notes:string/confirm_gesture = 0x7f0a000a +net.micode.notes:xml/preferences = 0x7f0c0000 +net.micode.notes:string/gesture_not_matched = 0x7f0a002b +net.micode.notes:string/failed_sdcard_export = 0x7f0a0017 +net.micode.notes:id/tv_title_bar = 0x7f05005b +net.micode.notes:string/notealert_enter = 0x7f0a0057 +net.micode.notes:string/error_note_not_exist = 0x7f0a0011 +net.micode.notes:id/menu_new_folder = 0x7f05003b +net.micode.notes:string/set_remind_time_message = 0x7f0a0072 +net.micode.notes:string/error_sync_network = 0x7f0a0016 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0013 +net.micode.notes:id/speech_to_text_btn = 0x7f050050 +net.micode.notes:string/app_widget2x2 = 0x7f0a0005 +net.micode.notes:string/menu_select_title = 0x7f0a004a +net.micode.notes:string/alert_title_delete = 0x7f0a0003 +net.micode.notes:string/gesture_verify_success = 0x7f0a0032 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:layout/datetime_picker = 0x7f060004 +net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 +net.micode.notes:string/sync_progress_init_list = 0x7f0a0075 +net.micode.notes:string/format_exported_file_location = 0x7f0a001f +net.micode.notes:string/menu_font_normal = 0x7f0a003e +net.micode.notes:raw/introduction = 0x7f090000 +net.micode.notes:menu/note_list_dropdown = 0x7f070004 +net.micode.notes:string/app_name = 0x7f0a0004 +net.micode.notes:menu/note_list = 0x7f070003 +net.micode.notes:style/CustomEditTextStyle = 0x7f0b0000 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a005f +net.micode.notes:layout/widget_2x = 0x7f060011 +net.micode.notes:id/etLoginUsername = 0x7f050017 +net.micode.notes:string/format_bold = 0x7f0a001b +net.micode.notes:string/ticker_success = 0x7f0a007a +net.micode.notes:layout/note_gesture_password = 0x7f06000a +>>>>>>> a +net.micode.notes:layout/note_edit_list_item = 0x7f060009 +net.micode.notes:layout/account_dialog_title = 0x7f060000 +net.micode.notes:layout/folder_list_item = 0x7f060006 +net.micode.notes:string/menu_search = 0x7f0a0047 +net.micode.notes:id/tv_modified_date = 0x7f050057 +net.micode.notes:id/tv_forgot_pattern = 0x7f050056 +net.micode.notes:color/gesture_icon_color = 0x7f020009 +net.micode.notes:id/menu_search = 0x7f05003d +net.micode.notes:id/tv_name = 0x7f050058 +net.micode.notes:id/toolbar = 0x7f050053 +net.micode.notes:string/menu_font_super = 0x7f0a0041 +net.micode.notes:id/textView = 0x7f050052 +net.micode.notes:string/error_sdcard_export = 0x7f0a0012 +net.micode.notes:id/preference_sync_button = 0x7f05004d +net.micode.notes:id/menu_list_mode = 0x7f05003a +net.micode.notes:id/iv_medium_select = 0x7f05002d +net.micode.notes:id/menu_export_text = 0x7f050038 +net.micode.notes:string/menu_folder_view = 0x7f0a003c +net.micode.notes:id/menu_delete = 0x7f050036 +net.micode.notes:layout/activity_register = 0x7f060002 +net.micode.notes:drawable/edit_blue = 0x7f040007 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f05004c +net.micode.notes:id/menu_alert = 0x7f050035 +net.micode.notes:string/menu_font_size = 0x7f0a003f +net.micode.notes:drawable/edit_title_yellow = 0x7f04000e +net.micode.notes:string/menu_alert = 0x7f0a0035 +net.micode.notes:id/lock_pattern_view = 0x7f050034 +net.micode.notes:style/GestureVerifyTheme = 0x7f0b0001 +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a0010 +net.micode.notes:id/record_audio_btn = 0x7f05004e +net.micode.notes:id/date = 0x7f050014 +net.micode.notes:id/ll_font_super = 0x7f050033 +net.micode.notes:string/success_sync_account = 0x7f0a0074 +net.micode.notes:id/etLoginPassword = 0x7f050016 +net.micode.notes:id/ll_font_normal = 0x7f050031 +net.micode.notes:menu/call_record_folder = 0x7f070001 +net.micode.notes:id/ll_font_large = 0x7f050030 +net.micode.notes:string/gesture_forgot_message = 0x7f0a0026 +net.micode.notes:drawable/list_green_down = 0x7f04002c +net.micode.notes:id/menu_new_note = 0x7f05003c +net.micode.notes:id/iv_lock_icon = 0x7f05002c +net.micode.notes:dimen/text_font_size_medium = 0x7f030001 +net.micode.notes:string/menu_setting = 0x7f0a004d +net.micode.notes:id/iv_bg_yellow = 0x7f050029 +net.micode.notes:string/error_sync_cancelled = 0x7f0a0014 +net.micode.notes:id/iv_bg_white_select = 0x7f050028 +net.micode.notes:drawable/widget_4x_blue = 0x7f04004d +net.micode.notes:id/iv_large_select = 0x7f05002b +net.micode.notes:string/menu_font_large = 0x7f0a003d +net.micode.notes:id/iv_bg_green_select = 0x7f050024 +net.micode.notes:id/widget_bg_image = 0x7f05005c +net.micode.notes:id/amPm = 0x7f050004 +net.micode.notes:id/iv_bg_green = 0x7f050023 +net.micode.notes:layout/settings_header = 0x7f060010 +net.micode.notes:id/iv_bg_blue = 0x7f050021 +net.micode.notes:drawable/new_note_pressed = 0x7f040040 +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040041 +net.micode.notes:id/hour = 0x7f05001e +net.micode.notes:style/NoteTheme = 0x7f0b0005 +net.micode.notes:layout/dialog_add_user = 0x7f060014 +net.micode.notes:id/font_size_selector = 0x7f05001c +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0064 +net.micode.notes:layout/note_gesture_verify = 0x7f06000b +net.micode.notes:id/btn_bullet = 0x7f050009 +net.micode.notes:id/et_edit_text = 0x7f05001a +net.micode.notes:string/hint_foler_name = 0x7f0a0033 +net.micode.notes:id/etUsername = 0x7f050019 +net.micode.notes:string/folder_exist = 0x7f0a001a +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0009 +net.micode.notes:id/ll_font_small = 0x7f050032 +net.micode.notes:id/etPassword = 0x7f050018 +net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000c +net.micode.notes:id/delete = 0x7f050015 +net.micode.notes:string/search = 0x7f0a006e +net.micode.notes:id/cb_edit_item = 0x7f050013 +net.micode.notes:string/gesture_forgot_title = 0x7f0a0028 +net.micode.notes:drawable/widget_2x_yellow = 0x7f04004c +net.micode.notes:id/btn_text_color = 0x7f050011 +net.micode.notes:id/imageView = 0x7f05001f +net.micode.notes:color/button_text_color = 0x7f020002 +net.micode.notes:id/btn_strikethrough = 0x7f050010 +net.micode.notes:id/menu_font_size = 0x7f050039 +net.micode.notes:string/search_hint = 0x7f0a006f +net.micode.notes:id/btn_bold = 0x7f050008 +net.micode.notes:id/btn_new_note = 0x7f05000e +net.micode.notes:layout/note_list_footer = 0x7f06000f +net.micode.notes:drawable/list_red_single = 0x7f040032 +net.micode.notes:string/menu_send_to_desktop = 0x7f0a004b +net.micode.notes:id/btn_delete_image = 0x7f05000b +net.micode.notes:id/btn_confirm = 0x7f05000a +net.micode.notes:id/btnRegister = 0x7f050007 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a0062 +net.micode.notes:drawable/menu_move = 0x7f04003d +net.micode.notes:drawable/widget_4x_white = 0x7f040050 +net.micode.notes:id/btnLogin = 0x7f050006 +net.micode.notes:id/selection_menu = 0x7f05004f +net.micode.notes:string/info_note_enter_desktop = 0x7f0a0034 +net.micode.notes:id/add_img_btn = 0x7f050003 +net.micode.notes:id/account_dialog_title = 0x7f050001 +net.micode.notes:id/account_dialog_subtitle = 0x7f050000 +net.micode.notes:id/iv_bg_blue_select = 0x7f050022 +net.micode.notes:color/gesture_panel_background = 0x7f02000d +net.micode.notes:drawable/widget_4x_red = 0x7f04004f +net.micode.notes:string/gesture_matched = 0x7f0a002a +net.micode.notes:drawable/widget_4x_green = 0x7f04004e +net.micode.notes:drawable/widget_2x_red = 0x7f04004a +net.micode.notes:color/gesture_point_normal = 0x7f020010 +net.micode.notes:drawable/widget_2x_green = 0x7f040049 +net.micode.notes:id/tv_time = 0x7f050059 +net.micode.notes:drawable/widget_2x_blue = 0x7f040048 +net.micode.notes:drawable/title_bar_bg = 0x7f040046 +net.micode.notes:id/note_title = 0x7f05004a +net.micode.notes:drawable/title_alert = 0x7f040045 +net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:dimen/text_font_size_super = 0x7f030004 +net.micode.notes:drawable/selected = 0x7f040044 +net.micode.notes:id/iv_super_select = 0x7f05002f +net.micode.notes:drawable/search_result = 0x7f040043 +net.micode.notes:string/menu_title_select_folder = 0x7f0a0051 +net.micode.notes:string/menu_select_all = 0x7f0a0048 +net.micode.notes:drawable/toast_background = 0x7f040047 +net.micode.notes:drawable/gesture_button_background = 0x7f040018 +net.micode.notes:id/menu_set_gesture = 0x7f05003f +net.micode.notes:string/gesture_instruction = 0x7f0a0029 +net.micode.notes:id/iv_bg_red_select = 0x7f050026 +net.micode.notes:id/sv_note_edit = 0x7f050051 +net.micode.notes:drawable/new_note = 0x7f04003e +net.micode.notes:drawable/list_yellow_single = 0x7f04003a +net.micode.notes:drawable/list_yellow_down = 0x7f040038 +net.micode.notes:layout/widget_4x = 0x7f060012 +net.micode.notes:color/gesture_line_normal = 0x7f02000b +net.micode.notes:id/et_foler_name = 0x7f05001b +net.micode.notes:drawable/edit_green = 0x7f040008 +net.micode.notes:drawable/clock = 0x7f040004 +net.micode.notes:drawable/list_white_up = 0x7f040037 +net.micode.notes:layout/note_item = 0x7f06000c +net.micode.notes:drawable/list_white_single = 0x7f040036 +net.micode.notes:color/text_color_state_list = 0x7f020018 +net.micode.notes:color/user_query_highlight = 0x7f02001b +net.micode.notes:drawable/list_white_down = 0x7f040034 +net.micode.notes:drawable/widget_4x_yellow = 0x7f040051 +net.micode.notes:drawable/list_red_up = 0x7f040033 +net.micode.notes:drawable/list_green_middle = 0x7f04002d +net.micode.notes:string/menu_delete = 0x7f0a0037 +net.micode.notes:drawable/list_folder = 0x7f04002a +net.micode.notes:drawable/list_blue_up = 0x7f040029 +net.micode.notes:string/search_setting_description = 0x7f0a0071 +net.micode.notes:drawable/list_blue_single = 0x7f040028 +net.micode.notes:drawable/ic_warning = 0x7f040023 +net.micode.notes:drawable/list_blue_middle = 0x7f040027 +net.micode.notes:color/gesture_point_error = 0x7f02000f +net.micode.notes:string/gesture_password_set = 0x7f0a002c +net.micode.notes:drawable/list_background = 0x7f040025 +net.micode.notes:drawable/icon_app = 0x7f040024 +net.micode.notes:id/btn_italic = 0x7f05000c +net.micode.notes:id/btn_underline = 0x7f050012 +net.micode.notes:drawable/font_super = 0x7f040016 +net.micode.notes:id/menu_sync = 0x7f050042 +net.micode.notes:drawable/ic_format_underline = 0x7f040021 +net.micode.notes:drawable/call_record = 0x7f040003 +net.micode.notes:drawable/ic_lock_outline = 0x7f040022 +net.micode.notes:string/menu_font_small = 0x7f0a0040 +net.micode.notes:drawable/ic_format_strikethrough = 0x7f040020 +net.micode.notes:drawable/font_normal = 0x7f040013 +net.micode.notes:id/minute = 0x7f050043 +net.micode.notes:string/gesture_verify_hint = 0x7f0a0031 +net.micode.notes:dimen/text_font_size_normal = 0x7f030002 +net.micode.notes:drawable/ic_delete = 0x7f04001b +net.micode.notes:style/TextAppearanceSuper = 0x7f0b000b +net.micode.notes:menu/call_note_edit = 0x7f070000 +net.micode.notes:color/secondary_text_dark = 0x7f020016 +net.micode.notes:id/move = 0x7f050044 +net.micode.notes:id/iv_bg_yellow_select = 0x7f05002a +net.micode.notes:color/gesture_error_color = 0x7f020007 +net.micode.notes:drawable/gesture_panel_background = 0x7f040019 +net.micode.notes:drawable/font_small = 0x7f040015 +net.micode.notes:string/menu_sync_cancel = 0x7f0a0050 +net.micode.notes:drawable/ic_audio = 0x7f04001a +net.micode.notes:id/text_username = 0x7f050064 +net.micode.notes:color/primary_text_dark = 0x7f020015 +net.micode.notes:drawable/font_size_selector_bg = 0x7f040014 +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 +net.micode.notes:drawable/list_green_up = 0x7f04002f +net.micode.notes:id/btnBackToLogin = 0x7f050005 +net.micode.notes:color/gesture_link_color = 0x7f02000c +net.micode.notes:drawable/font_large = 0x7f040012 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0067 +net.micode.notes:id/note_edit_view = 0x7f050048 +net.micode.notes:drawable/edittext_background = 0x7f040011 +net.micode.notes:drawable/delete = 0x7f040005 +net.micode.notes:drawable/edit_yellow = 0x7f040010 +net.micode.notes:id/note_item = 0x7f050049 +net.micode.notes:menu/note_list_options = 0x7f070005 +net.micode.notes:id/iv_small_select = 0x7f05002e +net.micode.notes:color/gesture_panel_border = 0x7f02000e +net.micode.notes:string/preferences_account_title = 0x7f0a005d +net.micode.notes:drawable/list_white_middle = 0x7f040035 +net.micode.notes:drawable/edit_white = 0x7f04000f +net.micode.notes:drawable/edit_title_white = 0x7f04000d +net.micode.notes:string/button_delete = 0x7f0a0007 +net.micode.notes:drawable/new_note_normal = 0x7f04003f +net.micode.notes:xml/searchable = 0x7f0c0001 +net.micode.notes:string/menu_folder_delete = 0x7f0a003b +net.micode.notes:string/gesture_too_short = 0x7f0a002d +net.micode.notes:drawable/dropdown_icon = 0x7f040006 +net.micode.notes:drawable/list_yellow_up = 0x7f04003b +net.micode.notes:id/note_bg_color_selector = 0x7f050046 +net.micode.notes:drawable/list_footer_bg = 0x7f04002b +net.micode.notes:drawable/edit_title_green = 0x7f04000b +net.micode.notes:string/preferences_add_account = 0x7f0a005e +net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 +net.micode.notes:color/gesture_hint_color = 0x7f020008 +net.micode.notes:string/cancel = 0x7f0a0009 +net.micode.notes:dimen/text_font_size_small = 0x7f030003 +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0061 +net.micode.notes:drawable/ic_format_italic = 0x7f04001f +net.micode.notes:string/gesture_verify_fail_max = 0x7f0a002f +net.micode.notes:id/iv_bg_red = 0x7f050025 +net.micode.notes:drawable/notification = 0x7f040042 +net.micode.notes:id/tv_alert_date = 0x7f050054 +net.micode.notes:dimen/text_font_size_large = 0x7f030000 +net.micode.notes:layout/item_user = 0x7f060015 +net.micode.notes:color/toolbar_button_selected = 0x7f02001a +net.micode.notes:drawable/ic_format_color = 0x7f04001e +net.micode.notes:color/toolbar_background = 0x7f020019 +net.micode.notes:drawable/edit_title_red = 0x7f04000c +net.micode.notes:id/note_edit_list = 0x7f050047 +net.micode.notes:id/iv_alert_icon = 0x7f050020 +net.micode.notes:drawable/edit_red = 0x7f040009 +net.micode.notes:color/text_color = 0x7f020017 +net.micode.notes:id/menu_setting = 0x7f050040 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0068 +net.micode.notes:drawable/ic_format_bullet = 0x7f04001d +net.micode.notes:id/iv_bg_white = 0x7f050027 +net.micode.notes:id/btn_delete_user = 0x7f05005f +net.micode.notes:drawable/gesture_background = 0x7f040017 +net.micode.notes:id/btn_logout = 0x7f05000d +net.micode.notes:drawable/button_background = 0x7f040002 +net.micode.notes:string/preferences_last_sync_time = 0x7f0a0066 +net.micode.notes:color/gesture_button_background = 0x7f020004 +net.micode.notes:color/gesture_text_color = 0x7f020013 +net.micode.notes:id/action_select_all = 0x7f050002 +net.micode.notes:color/gesture_point_selected = 0x7f020011 +net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000e +net.micode.notes:drawable/list_blue_down = 0x7f040026 +net.micode.notes:drawable/list_red_middle = 0x7f040031 +net.micode.notes:drawable/list_red_down = 0x7f040030 +net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 +<<<<<<< HEAD +net.micode.notes:drawable/list_green_single = 0x7f040023 +>>>>>>> a +======= +net.micode.notes:drawable/list_green_single = 0x7f04002e +net.micode.notes:string/format_text_color = 0x7f0a0024 +net.micode.notes:id/tv_title = 0x7f05005a +net.micode.notes:color/gesture_success_color = 0x7f020012 +net.micode.notes:string/preferences_account_summary = 0x7f0a005c +net.micode.notes:color/gesture_line_error = 0x7f02000a +net.micode.notes:array/format_for_exported_note = 0x7f010000 +net.micode.notes:drawable/ic_format_bold = 0x7f04001c +net.micode.notes:color/gesture_background = 0x7f020003 +net.micode.notes:string/ticker_fail = 0x7f0a0079 +net.micode.notes:string/file_name_txt_format = 0x7f0a0018 +net.micode.notes:id/gesture_status = 0x7f05001d +net.micode.notes:color/gesture_button_text = 0x7f020006 +net.micode.notes:color/gesture_button_ripple = 0x7f020005 +net.micode.notes:string/error_sync_internal = 0x7f0a0015 +net.micode.notes:drawable/menu_delete = 0x7f04003c +net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 +net.micode.notes:id/menu_delete_remind = 0x7f050037 +net.micode.notes:drawable/widget_2x_white = 0x7f04004b +net.micode.notes:string/confirm_gesture_pattern = 0x7f0a000b +net.micode.notes:color/hint_color = 0x7f020014 +net.micode.notes:string/sync_progress_login = 0x7f0a0076 +net.micode.notes:array/menu_share_ways = 0x7f010001 +net.micode.notes:drawable/edit_title_blue = 0x7f04000a +net.micode.notes:id/navigation_bar = 0x7f050045 +net.micode.notes:color/background_color = 0x7f020000 +net.micode.notes:drawable/list_yellow_middle = 0x7f040039 +net.micode.notes:color/button_color = 0x7f020001 +>>>>>>> a diff --git a/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt index 9ec4200..0ac2c2d 100644 --- a/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt +++ b/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt @@ -4,6 +4,11 @@ array menu_share_ways color background_color color button_color color button_text_color +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 color gesture_background color gesture_button_background color gesture_button_ripple @@ -21,6 +26,10 @@ color gesture_point_normal color gesture_point_selected color gesture_success_color color gesture_text_color +<<<<<<< HEAD +======= +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 color hint_color color primary_text_dark color secondary_text_dark @@ -57,10 +66,20 @@ drawable font_normal drawable font_size_selector_bg drawable font_small drawable font_super +<<<<<<< HEAD drawable gesture_background drawable gesture_button_background drawable gesture_panel_background drawable ic_audio +======= +<<<<<<< HEAD +drawable ic_audio +======= +drawable gesture_background +drawable gesture_button_background +drawable gesture_panel_background +drawable ic_audio +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 drawable ic_delete drawable ic_format_bold drawable ic_format_bullet @@ -69,6 +88,10 @@ drawable ic_format_italic drawable ic_format_strikethrough drawable ic_format_underline drawable ic_lock_outline +<<<<<<< HEAD +======= +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 drawable ic_warning drawable icon_app drawable list_background @@ -124,6 +147,15 @@ id amPm id btnBackToLogin id btnLogin id btnRegister +<<<<<<< HEAD +======= +<<<<<<< HEAD +<<<<<<< HEAD +======= +id btn_confirm +>>>>>>> a +======= +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 id btn_add_user id btn_bold id btn_bullet @@ -132,6 +164,10 @@ id btn_confirm_add_user id btn_delete_image id btn_delete_user id btn_italic +<<<<<<< HEAD +======= +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 id btn_logout id btn_new_note id btn_set_bg_color @@ -149,7 +185,14 @@ id etUsername id et_edit_text id et_foler_name id font_size_selector +<<<<<<< HEAD id gesture_status +======= +<<<<<<< HEAD +======= +id gesture_status +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 id hour id imageView id input_password @@ -166,7 +209,14 @@ id iv_bg_white_select id iv_bg_yellow id iv_bg_yellow_select id iv_large_select +<<<<<<< HEAD +id iv_lock_icon +======= +<<<<<<< HEAD +======= id iv_lock_icon +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 id iv_medium_select id iv_small_select id iv_super_select @@ -175,7 +225,14 @@ id ll_font_large id ll_font_normal id ll_font_small id ll_font_super +<<<<<<< HEAD +id lock_pattern_view +======= +<<<<<<< HEAD +======= id lock_pattern_view +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 id menu_alert id menu_delete id menu_delete_remind @@ -187,7 +244,14 @@ id menu_new_folder id menu_new_note id menu_search id menu_send_to_desktop +<<<<<<< HEAD id menu_set_gesture +======= +<<<<<<< HEAD +======= +id menu_set_gesture +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 id menu_setting id menu_share id menu_sync @@ -214,7 +278,14 @@ id tvLoginTitle id tvRegisterTitle id tv_alert_date id tv_folder_name +<<<<<<< HEAD +id tv_forgot_pattern +======= +<<<<<<< HEAD +======= id tv_forgot_pattern +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 id tv_modified_date id tv_name id tv_time @@ -235,8 +306,16 @@ layout item_user layout layout_custom_toast layout note_edit layout note_edit_list_item +<<<<<<< HEAD layout note_gesture_password layout note_gesture_verify +======= +<<<<<<< HEAD +======= +layout note_gesture_password +layout note_gesture_verify +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 layout note_item layout note_list layout note_list_dropdown_menu @@ -262,9 +341,18 @@ string app_widget2x2 string app_widget4x4 string button_delete string call_record_folder_name +<<<<<<< HEAD +string cancel +string confirm_gesture +string confirm_gesture_pattern +======= +<<<<<<< HEAD +======= string cancel string confirm_gesture string confirm_gesture_pattern +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 string datetime_dialog_cancel string datetime_dialog_ok string delete_remind_time_message @@ -288,9 +376,20 @@ string format_exported_file_location string format_folder_files_count string format_italic string format_move_notes_to_folder +<<<<<<< HEAD string format_strikethrough string format_text_color string format_underline +======= +<<<<<<< HEAD +<<<<<<< HEAD +======= +======= +string format_strikethrough +string format_text_color +string format_underline +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 string gesture_forgot_message string gesture_forgot_pattern string gesture_forgot_title @@ -304,6 +403,10 @@ string gesture_verify_fail_max string gesture_verify_fail_tries string gesture_verify_hint string gesture_verify_success +<<<<<<< HEAD +======= +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 string hint_foler_name string info_note_enter_desktop string menu_alert @@ -329,7 +432,14 @@ string menu_select_all string menu_select_none string menu_select_title string menu_send_to_desktop +<<<<<<< HEAD +string menu_set_gesture +======= +<<<<<<< HEAD +======= string menu_set_gesture +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 string menu_setting string menu_share string menu_sync @@ -344,7 +454,14 @@ string notealert_enter string notealert_ok string notelist_menu_new string notelist_string_info +<<<<<<< HEAD string ok +======= +<<<<<<< HEAD +======= +string ok +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 string preferences_account_summary string preferences_account_title string preferences_add_account @@ -380,7 +497,14 @@ string ticker_syncing string widget_havenot_content string widget_under_visit_mode style CustomEditTextStyle +<<<<<<< HEAD +style GestureVerifyTheme +======= +<<<<<<< HEAD +======= style GestureVerifyTheme +>>>>>>> a +>>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06 style HighlightTextAppearancePrimary style HighlightTextAppearanceSecondary style NoteActionBarStyle diff --git a/Src/app/build/outputs/logs/manifest-merger-debug-report.txt b/Src/app/build/outputs/logs/manifest-merger-debug-report.txt index 8c48d73..ef6b78f 100644 --- a/Src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/Src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,262 +1,262 @@ -- Merging decision tree log --- manifest -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-148:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-148:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-148:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-148:12 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12 MERGED from [com.alphacephei:vosk-android:0.3.38] D:\Notes\caches\transforms-3\56c56b617d8c6655fd5dde2ec0086806\transformed\vosk-android-0.3.38\AndroidManifest.xml:2:1-9:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-148:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-148:12 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-148:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12 +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12 package - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:5-31 - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:4:5-31 + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:6:5-30 - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:6:5-30 + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml xmlns:tools - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:3:5-51 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:3:5-51 xmlns:android - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:11-69 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:11-69 android:versionCode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:5:5-28 - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:5:5-28 + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml uses-permission#android.permission.RECORD_AUDIO -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:9:5-71 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:9:5-71 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:9:22-68 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:9:22-68 uses-permission#android.permission.MODIFY_AUDIO_SETTINGS -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:10:5-80 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:10:5-80 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:10:22-77 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:10:22-77 uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-81 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:11:5-81 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:22-78 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:11:22-78 uses-permission#android.permission.READ_EXTERNAL_STORAGE -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:12:5-80 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:12:5-80 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:12:22-77 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:12:22-77 uses-permission#android.permission.INTERNET -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:13:5-67 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:13:5-67 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:13:22-64 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:13:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:5-72 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:14:5-72 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:22-69 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:14:22-69 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:15:5-81 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:5-81 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:15:22-78 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:22-78 application -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:17:5-147:19 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-147:19 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:19:9-41 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41 android:icon - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:18:9-42 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:18:9-42 activity#net.micode.notes.login.LoginActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:22:9-29:20 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:22:9-29:20 android:launchMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:24:13-43 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:24:13-43 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:23:13-48 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:23:13-48 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:25:13-28:29 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:25:13-28:29 action#android.intent.action.MAIN -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:26:17-69 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:17-69 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:26:25-66 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:27:17-77 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:17-77 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:27:27-74 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:27-74 activity#net.micode.notes.login.RegisterActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:32:9-60 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:9-60 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:32:19-57 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:19-57 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:34:9-40:55 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:34:9-40:55 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:37:13-45 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:37:13-45 android:launchMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:38:13-43 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:38:13-43 android:windowSoftInputMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:40:13-52 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:40:13-52 android:configChanges - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:36:13-74 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:36:13-74 android:theme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:39:13-45 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:39:13-45 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:35:13-49 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:35:13-49 activity#net.micode.notes.ui.NoteGesturePasswordActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:41:9-44:70 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:41:9-44:70 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:43:13-53 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:43:13-53 android:theme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:44:13-67 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:44:13-67 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:42:13-59 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:42:13-59 activity#net.micode.notes.ui.NoteGestureVerifyActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:45:9-49:63 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:45:9-49:63 android:screenOrientation - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:48:13-49 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:48:13-49 android:windowSoftInputMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:49:13-60 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:49:13-60 android:theme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:47:13-54 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:47:13-54 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:46:13-57 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:46:13-57 activity#net.micode.notes.login.UserManagementActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:51:9-65 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-65 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:51:19-63 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:19-63 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:53:9-79:20 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:9-79:20 android:launchMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:56:13-43 android:configChanges - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-74 android:theme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:13-45 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\gitnote\notes\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:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:58:13-65:29 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:58:13-65:29 android:scheme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:59:17-38 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-38 tools:ignore - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:60:17-47 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-47 action#android.intent.action.VIEW -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:61:17-69 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-69 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:61:25-66 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:25-66 category#android.intent.category.DEFAULT -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:62:17-76 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:62:27-73 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73 data -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:17-78 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78 android:mimeType - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:23-75 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:63: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:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:66:13-71:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:67:17-79 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\gitnote\notes\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:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:72:13-75:29 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:72:13-75:29 action#android.intent.action.SEARCH -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:73:17-71 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:17-71 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:73:25-68 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:25-68 meta-data#android.app.searchable -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:76:13-78:54 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:13-78:54 android:resource - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:78:17-51 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:78:17-51 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:77:17-54 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:77:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:82:9-85:43 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:9-85:43 android:authorities - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:84:13-47 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:84:13-47 android:multiprocess - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:85:13-40 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:85:13-40 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:83:13-63 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:88:9-98:20 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:9-98:20 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:13-50 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:13-94:29 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:13-94:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:17-84 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:25-82 meta-data#android.appwidget.provider -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:95:13-97:58 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:13-97:58 android:resource - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:97:17-55 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:97:17-55 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:96:17-58 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:96:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:100:9-110:20 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:9-110:20 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:102:13-50 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:102:13-50 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:101:13-57 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:101:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:113:9-117:20 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:9-117:20 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:113:19-55 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:114:13-116:29 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:114:13-116:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:115:17-79 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:17-79 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:115:25-76 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:120:9-122:41 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:9-122:41 android:process - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:122:13-38 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:122:13-38 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:121:13-61 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:121:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:125:9-129:87 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:9-129:87 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:127:13-45 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-45 android:launchMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:128:13-48 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:128:13-48 android:theme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:129:13-75 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:129:13-75 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:126:13-50 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:132:9-136:72 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:9-136:72 android:label - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:134:13-54 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-54 android:launchMode - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:135:13-43 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:135:13-43 android:theme - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:136:13-60 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:136:13-60 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:133:13-71 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:139:9-141:40 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:9-141:40 android:exported - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:141:13-37 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:141:13-37 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:140:13-74 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:140:13-74 meta-data#android.app.default_searchable -ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:144:9-146:52 +ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:9-146:52 android:value - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:146:13-49 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:146:13-49 android:name - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:145:13-58 + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:145:13-58 uses-sdk -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml MERGED from [com.alphacephei:vosk-android:0.3.38] D:\Notes\caches\transforms-3\56c56b617d8c6655fd5dde2ec0086806\transformed\vosk-android-0.3.38\AndroidManifest.xml:5:5-7:41 MERGED from [com.alphacephei:vosk-android:0.3.38] D:\Notes\caches\transforms-3\56c56b617d8c6655fd5dde2ec0086806\transformed\vosk-android-0.3.38\AndroidManifest.xml:5:5-7:41 -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml -INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml +INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml android:targetSdkVersion - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml android:minSdkVersion - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml - INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml + INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml