diff --git a/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt index 66652a5..46dacc6 100644 --- a/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt +++ b/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt @@ -1,2 +1,2 @@ #- File Locator - -listingFile=../../../outputs/apk/debug/output-metadata.json +listingFile=../../apk/debug/output-metadata.json diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 049d72a..601f245 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin index ad01068..601f245 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index be8b218..601f245 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_0/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_1/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_2/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_3/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_4/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_4/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_df84bca282abd5fb0194d64501ed45795cc5f4707af61c2e5993d9c010c0067c_bucket_5/graph.bin and /dev/null differ diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 82c971a..7754af2 100644 Binary files a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 1dbeb2b..299d776 100644 Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/app/build/intermediates/dex_number_of_buckets_file/debug/out b/app/build/intermediates/dex_number_of_buckets_file/debug/out index 62f9457..301160a 100644 --- a/app/build/intermediates/dex_number_of_buckets_file/debug/out +++ b/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -1 +1 @@ -6 \ No newline at end of file +8 \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 6003069..f2aaa5c 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Sun Mar 26 22:12:06 CST 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\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\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Notes_\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +#Fri Mar 31 16:49:14 CST 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\Android_projects\\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\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Android_projects\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index a457757..5c95db1 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - + 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index e9dfe4b..91782ec 100644 --- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/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/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index c0d4e6c..f7f9c4a 100644 --- a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/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/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index c2fc6f4..f709c8c 100644 --- a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/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/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 1003923..e1e5665 100644 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Sun Mar 26 21:51:26 CST 2023 -base.0=D\:\\Notes_\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Fri Mar 31 16:49:37 CST 2023 +base.0=D\:\\Android_projects\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 5ada453..64fc856 100644 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class index 6e28b50..393e865 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index fd7f962..9ac9584 100644 --- a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -17,256 +17,259 @@ 17 -21 -22 D:\Notes_\app\src\main\AndroidManifest.xml:23:5-44 -23 android:minSdkVersion="1" -23-->D:\Notes_\app\src\main\AndroidManifest.xml:23:15-41 -24 android:targetSdkVersion="14" /> -24-->D:\Notes_\app\src\main\AndroidManifest.xml:23:5-44 -25 -26 -26-->D:\Notes_\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\Notes_\app\src\main\AndroidManifest.xml:25:22-78 -27 -27-->D:\Notes_\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\Notes_\app\src\main\AndroidManifest.xml:26:22-85 -28 -28-->D:\Notes_\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\Notes_\app\src\main\AndroidManifest.xml:27:22-64 -29 -29-->D:\Notes_\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\Notes_\app\src\main\AndroidManifest.xml:28:22-69 -30 -30-->D:\Notes_\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\Notes_\app\src\main\AndroidManifest.xml:29:22-71 -31 -31-->D:\Notes_\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\Notes_\app\src\main\AndroidManifest.xml:30:22-77 -32 -32-->D:\Notes_\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\Notes_\app\src\main\AndroidManifest.xml:31:22-68 -33 -33-->D:\Notes_\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\Notes_\app\src\main\AndroidManifest.xml:32:22-71 -34 -34-->D:\Notes_\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\Notes_\app\src\main\AndroidManifest.xml:33:22-78 -35 -36 D:\Notes_\app\src\main\AndroidManifest.xml:35:5-149:19 -37 android:debuggable="true" -38 android:icon="@drawable/icon_app" -38-->D:\Notes_\app\src\main\AndroidManifest.xml:36:9-42 -39 android:label="@string/app_name" > -39-->D:\Notes_\app\src\main\AndroidManifest.xml:37:9-41 -40 D:\Notes_\app\src\main\AndroidManifest.xml:38:9-51:20 -41 android:name="net.micode.notes.ui.NotesListActivity" -41-->D:\Notes_\app\src\main\AndroidManifest.xml:39:13-49 -42 android:configChanges="keyboardHidden|orientation|screenSize" -42-->D:\Notes_\app\src\main\AndroidManifest.xml:40:13-74 -43 android:label="@string/app_name" -43-->D:\Notes_\app\src\main\AndroidManifest.xml:41:13-45 -44 android:launchMode="singleTop" -44-->D:\Notes_\app\src\main\AndroidManifest.xml:42:13-43 -45 android:theme="@style/NoteTheme" -45-->D:\Notes_\app\src\main\AndroidManifest.xml:43:13-45 -46 android:uiOptions="splitActionBarWhenNarrow" -46-->D:\Notes_\app\src\main\AndroidManifest.xml:44:13-57 -47 android:windowSoftInputMode="adjustPan" > -47-->D:\Notes_\app\src\main\AndroidManifest.xml:45:13-52 -48 -48-->D:\Notes_\app\src\main\AndroidManifest.xml:47:13-50:29 -49 -49-->D:\Notes_\app\src\main\AndroidManifest.xml:48:17-69 -49-->D:\Notes_\app\src\main\AndroidManifest.xml:48:25-66 -50 -51 -51-->D:\Notes_\app\src\main\AndroidManifest.xml:49:17-77 -51-->D:\Notes_\app\src\main\AndroidManifest.xml:49:27-74 -52 -53 -54 D:\Notes_\app\src\main\AndroidManifest.xml:53:9-81:20 -55 android:name="net.micode.notes.ui.NoteEditActivity" -55-->D:\Notes_\app\src\main\AndroidManifest.xml:54:13-48 -56 android:configChanges="keyboardHidden|orientation|screenSize" -56-->D:\Notes_\app\src\main\AndroidManifest.xml:55:13-74 -57 android:launchMode="singleTop" -57-->D:\Notes_\app\src\main\AndroidManifest.xml:56:13-43 -58 android:theme="@style/NoteTheme" > -58-->D:\Notes_\app\src\main\AndroidManifest.xml:57:13-45 -59 -59-->D:\Notes_\app\src\main\AndroidManifest.xml:59:13-64:29 -60 -60-->D:\Notes_\app\src\main\AndroidManifest.xml:60:17-69 -60-->D:\Notes_\app\src\main\AndroidManifest.xml:60:25-66 -61 -62 -62-->D:\Notes_\app\src\main\AndroidManifest.xml:61:17-76 -62-->D:\Notes_\app\src\main\AndroidManifest.xml:61:27-73 +20 android:versionName="0.1" > +21 D:\Android_projects\app\src\main\AndroidManifest.xml:24:5-44 +22 android:minSdkVersion="1" +22-->D:\Android_projects\app\src\main\AndroidManifest.xml:24:15-41 +23 android:targetSdkVersion="14" /> +23-->D:\Android_projects\app\src\main\AndroidManifest.xml:24:5-44 +24 +25 +25-->D:\Android_projects\app\src\main\AndroidManifest.xml:26:5-81 +25-->D:\Android_projects\app\src\main\AndroidManifest.xml:26:22-78 +26 +26-->D:\Android_projects\app\src\main\AndroidManifest.xml:27:5-88 +26-->D:\Android_projects\app\src\main\AndroidManifest.xml:27:22-85 +27 +27-->D:\Android_projects\app\src\main\AndroidManifest.xml:28:5-67 +27-->D:\Android_projects\app\src\main\AndroidManifest.xml:28:22-64 +28 +28-->D:\Android_projects\app\src\main\AndroidManifest.xml:29:5-72 +28-->D:\Android_projects\app\src\main\AndroidManifest.xml:29:22-69 +29 +29-->D:\Android_projects\app\src\main\AndroidManifest.xml:30:5-74 +29-->D:\Android_projects\app\src\main\AndroidManifest.xml:30:22-71 +30 +30-->D:\Android_projects\app\src\main\AndroidManifest.xml:31:5-80 +30-->D:\Android_projects\app\src\main\AndroidManifest.xml:31:22-77 +31 +31-->D:\Android_projects\app\src\main\AndroidManifest.xml:32:5-71 +31-->D:\Android_projects\app\src\main\AndroidManifest.xml:32:22-68 +32 +32-->D:\Android_projects\app\src\main\AndroidManifest.xml:33:5-74 +32-->D:\Android_projects\app\src\main\AndroidManifest.xml:33:22-71 +33 +33-->D:\Android_projects\app\src\main\AndroidManifest.xml:34:5-81 +33-->D:\Android_projects\app\src\main\AndroidManifest.xml:34:22-78 +34 +35 D:\Android_projects\app\src\main\AndroidManifest.xml:37:5-153:19 +36 android:debuggable="true" +37 android:icon="@drawable/icon_app" +37-->D:\Android_projects\app\src\main\AndroidManifest.xml:38:9-42 +38 android:label="@string/app_name" +38-->D:\Android_projects\app\src\main\AndroidManifest.xml:39:9-41 +39 android:testOnly="true" > +40 +41 +42 D:\Android_projects\app\src\main\AndroidManifest.xml:41:9-54:20 +43 android:name="net.micode.notes.ui.NotesListActivity" +43-->D:\Android_projects\app\src\main\AndroidManifest.xml:42:13-49 +44 android:configChanges="keyboardHidden|orientation|screenSize" +44-->D:\Android_projects\app\src\main\AndroidManifest.xml:43:13-74 +45 android:label="@string/app_name" +45-->D:\Android_projects\app\src\main\AndroidManifest.xml:44:13-45 +46 android:launchMode="singleTop" +46-->D:\Android_projects\app\src\main\AndroidManifest.xml:45:13-43 +47 android:theme="@style/NoteTheme" +47-->D:\Android_projects\app\src\main\AndroidManifest.xml:46:13-45 +48 android:uiOptions="splitActionBarWhenNarrow" +48-->D:\Android_projects\app\src\main\AndroidManifest.xml:47:13-57 +49 android:windowSoftInputMode="adjustPan" > +49-->D:\Android_projects\app\src\main\AndroidManifest.xml:48:13-52 +50 +50-->D:\Android_projects\app\src\main\AndroidManifest.xml:50:13-53:29 +51 +51-->D:\Android_projects\app\src\main\AndroidManifest.xml:51:17-69 +51-->D:\Android_projects\app\src\main\AndroidManifest.xml:51:25-66 +52 +53 +53-->D:\Android_projects\app\src\main\AndroidManifest.xml:52:17-77 +53-->D:\Android_projects\app\src\main\AndroidManifest.xml:52:27-74 +54 +55 +56 D:\Android_projects\app\src\main\AndroidManifest.xml:56:9-84:20 +57 android:name="net.micode.notes.ui.NoteEditActivity" +57-->D:\Android_projects\app\src\main\AndroidManifest.xml:57:13-48 +58 android:configChanges="keyboardHidden|orientation|screenSize" +58-->D:\Android_projects\app\src\main\AndroidManifest.xml:58:13-74 +59 android:launchMode="singleTop" +59-->D:\Android_projects\app\src\main\AndroidManifest.xml:59:13-43 +60 android:theme="@style/NoteTheme" > +60-->D:\Android_projects\app\src\main\AndroidManifest.xml:60:13-45 +61 +61-->D:\Android_projects\app\src\main\AndroidManifest.xml:62:13-67:29 +62 +62-->D:\Android_projects\app\src\main\AndroidManifest.xml:63:17-69 +62-->D:\Android_projects\app\src\main\AndroidManifest.xml:63:25-66 63 -64 -64-->D:\Notes_\app\src\main\AndroidManifest.xml:62:17-78 -64-->D:\Notes_\app\src\main\AndroidManifest.xml:62:23-75 -65 -65-->D:\Notes_\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\Notes_\app\src\main\AndroidManifest.xml:62:23-75 -66 -67 -67-->D:\Notes_\app\src\main\AndroidManifest.xml:66:13-71:29 -68 -68-->D:\Notes_\app\src\main\AndroidManifest.xml:67:17-79 -68-->D:\Notes_\app\src\main\AndroidManifest.xml:67:25-76 -69 -70 -70-->D:\Notes_\app\src\main\AndroidManifest.xml:61:17-76 -70-->D:\Notes_\app\src\main\AndroidManifest.xml:61:27-73 +64 +64-->D:\Android_projects\app\src\main\AndroidManifest.xml:64:17-76 +64-->D:\Android_projects\app\src\main\AndroidManifest.xml:64:27-73 +65 +66 +66-->D:\Android_projects\app\src\main\AndroidManifest.xml:65:17-78 +66-->D:\Android_projects\app\src\main\AndroidManifest.xml:65:23-75 +67 +67-->D:\Android_projects\app\src\main\AndroidManifest.xml:65:17-78 +67-->D:\Android_projects\app\src\main\AndroidManifest.xml:65:23-75 +68 +69 +69-->D:\Android_projects\app\src\main\AndroidManifest.xml:69:13-74:29 +70 +70-->D:\Android_projects\app\src\main\AndroidManifest.xml:70:17-79 +70-->D:\Android_projects\app\src\main\AndroidManifest.xml:70:25-76 71 -72 -72-->D:\Notes_\app\src\main\AndroidManifest.xml:62:17-78 -72-->D:\Notes_\app\src\main\AndroidManifest.xml:62:23-75 -73 -73-->D:\Notes_\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\Notes_\app\src\main\AndroidManifest.xml:62:23-75 -74 -75 -75-->D:\Notes_\app\src\main\AndroidManifest.xml:73:13-76:29 -76 -76-->D:\Notes_\app\src\main\AndroidManifest.xml:74:17-71 -76-->D:\Notes_\app\src\main\AndroidManifest.xml:74:25-68 -77 -78 -78-->D:\Notes_\app\src\main\AndroidManifest.xml:61:17-76 -78-->D:\Notes_\app\src\main\AndroidManifest.xml:61:27-73 -79 -80 -81 D:\Notes_\app\src\main\AndroidManifest.xml:78:13-80:54 -82 android:name="android.app.searchable" -82-->D:\Notes_\app\src\main\AndroidManifest.xml:79:17-54 -83 android:resource="@xml/searchable" /> -83-->D:\Notes_\app\src\main\AndroidManifest.xml:80:17-51 -84 -85 -86 D:\Notes_\app\src\main\AndroidManifest.xml:83:9-86:43 -87 android:name="net.micode.notes.data.NotesProvider" -87-->D:\Notes_\app\src\main\AndroidManifest.xml:84:13-63 -88 android:authorities="micode_notes" -88-->D:\Notes_\app\src\main\AndroidManifest.xml:85:13-47 -89 android:multiprocess="true" /> -89-->D:\Notes_\app\src\main\AndroidManifest.xml:86:13-40 -90 -91 D:\Notes_\app\src\main\AndroidManifest.xml:88:9-100:20 -92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -92-->D:\Notes_\app\src\main\AndroidManifest.xml:89:13-57 -93 android:label="@string/app_widget2x2" > -93-->D:\Notes_\app\src\main\AndroidManifest.xml:90:13-50 -94 -94-->D:\Notes_\app\src\main\AndroidManifest.xml:91:13-95:29 -95 -95-->D:\Notes_\app\src\main\AndroidManifest.xml:92:17-84 -95-->D:\Notes_\app\src\main\AndroidManifest.xml:92:25-81 -96 -96-->D:\Notes_\app\src\main\AndroidManifest.xml:93:17-85 -96-->D:\Notes_\app\src\main\AndroidManifest.xml:93:25-82 -97 -97-->D:\Notes_\app\src\main\AndroidManifest.xml:94:17-85 -97-->D:\Notes_\app\src\main\AndroidManifest.xml:94:25-82 -98 -99 -100 D:\Notes_\app\src\main\AndroidManifest.xml:97:13-99:58 -101 android:name="android.appwidget.provider" -101-->D:\Notes_\app\src\main\AndroidManifest.xml:98:17-58 -102 android:resource="@xml/widget_2x_info" /> -102-->D:\Notes_\app\src\main\AndroidManifest.xml:99:17-55 -103 -104 D:\Notes_\app\src\main\AndroidManifest.xml:101:9-114:20 -105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -105-->D:\Notes_\app\src\main\AndroidManifest.xml:102:13-57 -106 android:label="@string/app_widget4x4" > -106-->D:\Notes_\app\src\main\AndroidManifest.xml:103:13-50 -107 -107-->D:\Notes_\app\src\main\AndroidManifest.xml:91:13-95:29 -108 -108-->D:\Notes_\app\src\main\AndroidManifest.xml:92:17-84 -108-->D:\Notes_\app\src\main\AndroidManifest.xml:92:25-81 -109 -109-->D:\Notes_\app\src\main\AndroidManifest.xml:93:17-85 -109-->D:\Notes_\app\src\main\AndroidManifest.xml:93:25-82 -110 -110-->D:\Notes_\app\src\main\AndroidManifest.xml:94:17-85 -110-->D:\Notes_\app\src\main\AndroidManifest.xml:94:25-82 -111 -112 -113 D:\Notes_\app\src\main\AndroidManifest.xml:97:13-99:58 -114 android:name="android.appwidget.provider" -114-->D:\Notes_\app\src\main\AndroidManifest.xml:98:17-58 -115 android:resource="@xml/widget_4x_info" /> -115-->D:\Notes_\app\src\main\AndroidManifest.xml:99:17-55 -116 -117 -117-->D:\Notes_\app\src\main\AndroidManifest.xml:116:9-120:20 -117-->D:\Notes_\app\src\main\AndroidManifest.xml:116:19-55 -118 -118-->D:\Notes_\app\src\main\AndroidManifest.xml:117:13-119:29 -119 -119-->D:\Notes_\app\src\main\AndroidManifest.xml:118:17-79 -119-->D:\Notes_\app\src\main\AndroidManifest.xml:118:25-76 -120 -121 -122 D:\Notes_\app\src\main\AndroidManifest.xml:122:9-125:20 -123 android:name="net.micode.notes.ui.AlarmReceiver" -123-->D:\Notes_\app\src\main\AndroidManifest.xml:123:13-61 -124 android:process=":remote" > -124-->D:\Notes_\app\src\main\AndroidManifest.xml:124:13-38 -125 -126 -127 D:\Notes_\app\src\main\AndroidManifest.xml:127:9-132:20 -128 android:name="net.micode.notes.ui.AlarmAlertActivity" -128-->D:\Notes_\app\src\main\AndroidManifest.xml:128:13-50 -129 android:label="@string/app_name" -129-->D:\Notes_\app\src\main\AndroidManifest.xml:129:13-45 -130 android:launchMode="singleInstance" -130-->D:\Notes_\app\src\main\AndroidManifest.xml:130:13-48 -131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -131-->D:\Notes_\app\src\main\AndroidManifest.xml:131:13-75 -132 -133 D:\Notes_\app\src\main\AndroidManifest.xml:134:9-139:20 -134 android:name="net.micode.notes.ui.NotesPreferenceActivity" -134-->D:\Notes_\app\src\main\AndroidManifest.xml:135:13-71 -135 android:label="@string/preferences_title" -135-->D:\Notes_\app\src\main\AndroidManifest.xml:136:13-54 -136 android:launchMode="singleTop" -136-->D:\Notes_\app\src\main\AndroidManifest.xml:137:13-43 -137 android:theme="@android:style/Theme.Holo.Light" > -137-->D:\Notes_\app\src\main\AndroidManifest.xml:138:13-60 -138 -139 -140 D:\Notes_\app\src\main\AndroidManifest.xml:141:9-144:19 -141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -141-->D:\Notes_\app\src\main\AndroidManifest.xml:142:13-74 -142 android:exported="false" > -142-->D:\Notes_\app\src\main\AndroidManifest.xml:143:13-37 -143 -144 -145 D:\Notes_\app\src\main\AndroidManifest.xml:146:9-148:52 -146 android:name="android.app.default_searchable" -146-->D:\Notes_\app\src\main\AndroidManifest.xml:147:13-58 -147 android:value=".ui.NoteEditActivity" /> -147-->D:\Notes_\app\src\main\AndroidManifest.xml:148:13-49 -148 -149 -150 +72 +72-->D:\Android_projects\app\src\main\AndroidManifest.xml:64:17-76 +72-->D:\Android_projects\app\src\main\AndroidManifest.xml:64:27-73 +73 +74 +74-->D:\Android_projects\app\src\main\AndroidManifest.xml:65:17-78 +74-->D:\Android_projects\app\src\main\AndroidManifest.xml:65:23-75 +75 +75-->D:\Android_projects\app\src\main\AndroidManifest.xml:65:17-78 +75-->D:\Android_projects\app\src\main\AndroidManifest.xml:65:23-75 +76 +77 +77-->D:\Android_projects\app\src\main\AndroidManifest.xml:76:13-79:29 +78 +78-->D:\Android_projects\app\src\main\AndroidManifest.xml:77:17-71 +78-->D:\Android_projects\app\src\main\AndroidManifest.xml:77:25-68 +79 +80 +80-->D:\Android_projects\app\src\main\AndroidManifest.xml:64:17-76 +80-->D:\Android_projects\app\src\main\AndroidManifest.xml:64:27-73 +81 +82 +83 D:\Android_projects\app\src\main\AndroidManifest.xml:81:13-83:54 +84 android:name="android.app.searchable" +84-->D:\Android_projects\app\src\main\AndroidManifest.xml:82:17-54 +85 android:resource="@xml/searchable" /> +85-->D:\Android_projects\app\src\main\AndroidManifest.xml:83:17-51 +86 +87 +88 +89 D:\Android_projects\app\src\main\AndroidManifest.xml:87:9-90:43 +90 android:name="net.micode.notes.data.NotesProvider" +90-->D:\Android_projects\app\src\main\AndroidManifest.xml:88:13-63 +91 android:authorities="micode_notes" +91-->D:\Android_projects\app\src\main\AndroidManifest.xml:89:13-47 +92 android:multiprocess="true" /> +92-->D:\Android_projects\app\src\main\AndroidManifest.xml:90:13-40 +93 +94 D:\Android_projects\app\src\main\AndroidManifest.xml:92:9-104:20 +95 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +95-->D:\Android_projects\app\src\main\AndroidManifest.xml:93:13-57 +96 android:label="@string/app_widget2x2" > +96-->D:\Android_projects\app\src\main\AndroidManifest.xml:94:13-50 +97 +97-->D:\Android_projects\app\src\main\AndroidManifest.xml:95:13-99:29 +98 +98-->D:\Android_projects\app\src\main\AndroidManifest.xml:96:17-84 +98-->D:\Android_projects\app\src\main\AndroidManifest.xml:96:25-81 +99 +99-->D:\Android_projects\app\src\main\AndroidManifest.xml:97:17-85 +99-->D:\Android_projects\app\src\main\AndroidManifest.xml:97:25-82 +100 +100-->D:\Android_projects\app\src\main\AndroidManifest.xml:98:17-85 +100-->D:\Android_projects\app\src\main\AndroidManifest.xml:98:25-82 +101 +102 +103 D:\Android_projects\app\src\main\AndroidManifest.xml:101:13-103:58 +104 android:name="android.appwidget.provider" +104-->D:\Android_projects\app\src\main\AndroidManifest.xml:102:17-58 +105 android:resource="@xml/widget_2x_info" /> +105-->D:\Android_projects\app\src\main\AndroidManifest.xml:103:17-55 +106 +107 D:\Android_projects\app\src\main\AndroidManifest.xml:105:9-118:20 +108 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +108-->D:\Android_projects\app\src\main\AndroidManifest.xml:106:13-57 +109 android:label="@string/app_widget4x4" > +109-->D:\Android_projects\app\src\main\AndroidManifest.xml:107:13-50 +110 +110-->D:\Android_projects\app\src\main\AndroidManifest.xml:95:13-99:29 +111 +111-->D:\Android_projects\app\src\main\AndroidManifest.xml:96:17-84 +111-->D:\Android_projects\app\src\main\AndroidManifest.xml:96:25-81 +112 +112-->D:\Android_projects\app\src\main\AndroidManifest.xml:97:17-85 +112-->D:\Android_projects\app\src\main\AndroidManifest.xml:97:25-82 +113 +113-->D:\Android_projects\app\src\main\AndroidManifest.xml:98:17-85 +113-->D:\Android_projects\app\src\main\AndroidManifest.xml:98:25-82 +114 +115 +116 D:\Android_projects\app\src\main\AndroidManifest.xml:101:13-103:58 +117 android:name="android.appwidget.provider" +117-->D:\Android_projects\app\src\main\AndroidManifest.xml:102:17-58 +118 android:resource="@xml/widget_4x_info" /> +118-->D:\Android_projects\app\src\main\AndroidManifest.xml:103:17-55 +119 +120 +120-->D:\Android_projects\app\src\main\AndroidManifest.xml:120:9-124:20 +120-->D:\Android_projects\app\src\main\AndroidManifest.xml:120:19-55 +121 +121-->D:\Android_projects\app\src\main\AndroidManifest.xml:121:13-123:29 +122 +122-->D:\Android_projects\app\src\main\AndroidManifest.xml:122:17-79 +122-->D:\Android_projects\app\src\main\AndroidManifest.xml:122:25-76 +123 +124 +125 D:\Android_projects\app\src\main\AndroidManifest.xml:126:9-129:20 +126 android:name="net.micode.notes.ui.AlarmReceiver" +126-->D:\Android_projects\app\src\main\AndroidManifest.xml:127:13-61 +127 android:process=":remote" > +127-->D:\Android_projects\app\src\main\AndroidManifest.xml:128:13-38 +128 +129 +130 D:\Android_projects\app\src\main\AndroidManifest.xml:131:9-136:20 +131 android:name="net.micode.notes.ui.AlarmAlertActivity" +131-->D:\Android_projects\app\src\main\AndroidManifest.xml:132:13-50 +132 android:label="@string/app_name" +132-->D:\Android_projects\app\src\main\AndroidManifest.xml:133:13-45 +133 android:launchMode="singleInstance" +133-->D:\Android_projects\app\src\main\AndroidManifest.xml:134:13-48 +134 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +134-->D:\Android_projects\app\src\main\AndroidManifest.xml:135:13-75 +135 +136 D:\Android_projects\app\src\main\AndroidManifest.xml:138:9-143:20 +137 android:name="net.micode.notes.ui.NotesPreferenceActivity" +137-->D:\Android_projects\app\src\main\AndroidManifest.xml:139:13-71 +138 android:label="@string/preferences_title" +138-->D:\Android_projects\app\src\main\AndroidManifest.xml:140:13-54 +139 android:launchMode="singleTop" +139-->D:\Android_projects\app\src\main\AndroidManifest.xml:141:13-43 +140 android:theme="@android:style/Theme.Holo.Light" > +140-->D:\Android_projects\app\src\main\AndroidManifest.xml:142:13-60 +141 +142 +143 D:\Android_projects\app\src\main\AndroidManifest.xml:145:9-148:19 +144 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +144-->D:\Android_projects\app\src\main\AndroidManifest.xml:146:13-74 +145 android:exported="false" > +145-->D:\Android_projects\app\src\main\AndroidManifest.xml:147:13-37 +146 +147 +148 D:\Android_projects\app\src\main\AndroidManifest.xml:150:9-152:52 +149 android:name="android.app.default_searchable" +149-->D:\Android_projects\app\src\main\AndroidManifest.xml:151:13-58 +150 android:value=".ui.NoteEditActivity" /> +150-->D:\Android_projects\app\src\main\AndroidManifest.xml:152:13-49 +151 +152 +153 diff --git a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 33ce68a..494b824 100644 --- a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -17,12 +17,11 @@ - + android:versionName="0.1" > - + @@ -32,11 +31,14 @@ - + + android:label="@string/app_name" + android:testOnly="true" > + + + - + diff --git a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 33ce68a..494b824 100644 --- a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -17,12 +17,11 @@ - + android:versionName="0.1" > - + @@ -32,11 +31,14 @@ - + + android:label="@string/app_name" + android:testOnly="true" > + + + - + diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 538ae3f..bab9966 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\Notes_\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\Notes_\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -40,6 +21,25 @@ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } + }, + { + "source": "D:\\Android_projects\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } } ] }, @@ -47,7 +47,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { - "source": "D:\\Notes_\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values\\strings.xml", "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -66,24 +66,26 @@ } }, { - "source": "D:\\Notes_\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", - "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } }, { - "source": "D:\\Notes_\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -100,7 +102,24 @@ } }, { - "source": "D:\\Notes_\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "D:\\Android_projects\\app\\src\\main\\res\\values\\styles.xml", "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", @@ -117,25 +136,6 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } - }, - { - "source": "D:\\Notes_\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } } ] }, @@ -143,26 +143,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\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": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", - "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": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,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" - } - }, - { - "source": "D:\\Notes_\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -179,6 +160,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\Android_projects\\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": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "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": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,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" + } } ] } diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 8e56ed7..3f92eff 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\Notes_\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\Notes_\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -40,6 +21,25 @@ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } + }, + { + "source": "D:\\Android_projects\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } } ] } diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index dea2733..293e68b 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\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": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", - "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": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,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" - } - }, - { - "source": "D:\\Notes_\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,6 +21,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\Android_projects\\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": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "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": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,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" + } } ] } diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index dfd183a..290e67c 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\Notes_\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values\\strings.xml", "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -23,24 +23,26 @@ } }, { - "source": "D:\\Notes_\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", - "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } }, { - "source": "D:\\Notes_\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -57,7 +59,24 @@ } }, { - "source": "D:\\Notes_\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\Android_projects\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "D:\\Android_projects\\app\\src\\main\\res\\values\\styles.xml", "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", @@ -74,25 +93,6 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } - }, - { - "source": "D:\\Notes_\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } } ] } diff --git a/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index 33ce68a..494b824 100644 --- a/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -17,12 +17,11 @@ - + android:versionName="0.1" > - + @@ -32,11 +31,14 @@ - + + android:label="@string/app_name" + android:testOnly="true" > + + + - + diff --git a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index f921ee5..9360e55 100644 Binary files a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar b/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar index 0d8147d..bb4e200 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar and b/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex index f29c886..ebf79ba 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex index 9fa0620..60cb9da 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index d8ec2c4..a2b0525 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex index 983f364..2fbf54b 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex index eceecda..bec0b42 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex index e32f11d..7302df1 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index 2f5ecfb..55c07e3 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex index e9e44c0..55990a0 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex index 3fe4a9b..0138acd 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index 95e9bfe..26f89d0 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index 22590ad..d104305 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex index ce7cad2..edca6c2 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex index d97427c..43fbb95 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex index 2932fd8..7043e40 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex index ac1eee3..86f3bdd 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex index 99b707a..24984cf 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex index 6521085..8fa92ab 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex index 3864095..7484169 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex index ae8724a..aa009a0 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex index b6c2fc1..8458001 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex index 3229f07..6b5778b 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index d1fa158..88b4980 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex index 52d747b..94117a4 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 5f93370..b13eeff 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex index bc7ec41..66440b5 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex index 71af18e..db641dc 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index 0139b42..7d8a2cc 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index 452e2d0..f34ea10 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex index 2115569..6f5252f 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 1a6a23a..802d1f8 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 1885fff..705f56a 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index 1107ccc..d9823b2 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex index 27b1830..7c5f9b2 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex index 144cf9c..5888fc6 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex index ffbb9b0..86f7f9f 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex index b6a3528..ef2fe6c 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex index ae6e2a4..a49e587 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index 869e07c..296ff56 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex index f67c640..602aad6 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index b171152..88ac5a9 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex index 525fa4f..b8af584 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex index 261b9bc..c6e8fd8 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex index 238447e..559c7e5 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex index bb825ba..b7482d9 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex index bf17cb1..2d3dad9 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex index b3346ee..288c6fd 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex index 5d89d10..c129c9e 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index 0b49183..6d2a0a4 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex index eaa7650..ac6117e 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex index fea922e..7201f1d 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index 5f69d8d..1fb0182 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex index 8f6696d..1cbdbb2 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex index 63acb0d..6c5293d 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index dca62bf..f2219ba 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index d339f97..c64b75d 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 4d23f7e..d76f231 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 213abb6..0d3d400 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 91b250c..33ac2d5 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 60573ff..5c48404 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index abcdb52..f5b5de2 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex index d2b4e3e..6f0d01c 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex index c5e6113..312fbad 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index c94758c..5b91144 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex index 5e2cb53..feb5c80 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 824e394..6b44eab 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 68ded96..9242bab 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index 67e1670..59d7247 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index bcac2ec..dd7c6cb 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index d511096..8c202a1 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index c225369..fb8b80e 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 8a40d27..76dc737 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 2aa9d47..4715f0f 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index e75d783..97ed6fa 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 4286590..8d7e1d8 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index eb9700e..600d8fb 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 0c3d635..4c8920b 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index 48c303e..9dee3c8 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index ee10b63..44f0b00 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index 1a8c370..53320f0 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index c9d8d94..4a550f2 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 5f84a51..b9b8ffd 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex index 311f487..dd72238 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex index d38040f..ab39c99 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 0734e34..f8c2de3 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 631e973..3884261 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex index e15a061..b125b7f 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex index 3c7c3d5..ea4d3bb 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex index 0883a78..303cd9e 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex index a4132a8..55eeca3 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex index 9dcc1b5..4ff53c2 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex index 4436b28..2559347 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex index 371948e..1b88930 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index da80f06..aae067f 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 1ef790d..b66222f 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 44db976..6c5e3be 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index 995370f..c8c3677 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex index 73f6100..affae58 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json index bb4deaa..51f6368 100644 --- a/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json +++ b/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json @@ -1 +1 @@ -{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file +{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/app/build/intermediates/source_set_path_map/debug/file-map.txt b/app/build/intermediates/source_set_path_map/debug/file-map.txt index 46e6a3c..d05d851 100644 --- a/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\Notes_\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\Notes_\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\Notes_\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\Notes_\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\Notes_\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\Notes_\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\Notes_\app\src\debug\res -net.micode.notes.app-main-7 D:\Notes_\app\src\main\res +net.micode.notes.app-pngs-0 D:\Android_projects\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\Android_projects\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\Android_projects\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\Android_projects\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\Android_projects\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\Android_projects\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\Android_projects\app\src\debug\res +net.micode.notes.app-main-7 D:\Android_projects\app\src\main\res diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt index 08d48a8..40f557a 100644 --- a/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,235 +1,235 @@ -- Merging decision tree log --- manifest -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml:18:1-150:12 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:18:1-154:12 +INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml:18:1-154:12 +INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml:18:1-154:12 +INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml:18:1-154:12 +INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml:18:1-154:12 +INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml:18:1-154:12 +INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml:18:1-154:12 package - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml + INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml + INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml + INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml:23:5-44 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml:24:5-44 android:targetSdkVersion - INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml + INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:24:5-44 + INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes_\app\src\main\AndroidManifest.xml + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:24:15-41 + INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml + INJECTED from D:\Android_projects\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:26:5-81 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:26:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:27:5-88 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:27:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:28:5-67 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:28:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:29:5-72 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:29:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:30:5-74 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:30:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:31:5-80 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:31:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:32:5-71 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:32:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:33:5-74 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:33:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:34:5-81 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:34:22-78 application -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:35:5-149:19 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:37:5-153:19 android:label - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:39:9-41 android:icon - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:38:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:41:9-54:20 android:label - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:44:13-45 android:launchMode - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:45:13-43 android:windowSoftInputMode - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:45:13-52 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:48:13-52 android:uiOptions - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:44:13-57 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:47:13-57 android:configChanges - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:43:13-74 android:theme - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:46:13-45 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:42:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:50:13-53:29 action#android.intent.action.MAIN -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:51:17-69 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:51:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:52:17-77 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:52:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:56:9-84:20 android:launchMode - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:59:13-43 android:configChanges - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:58:13-74 android:theme - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:60:13-45 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:57:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:62:13-67:29 action#android.intent.action.VIEW -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:63:17-69 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:63:25-66 category#android.intent.category.DEFAULT -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:64:17-76 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:64:27-73 data -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:65:17-78 android:mimeType - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:65: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:\Notes_\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:69:13-74:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:70:17-79 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:70:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:76:13-79:29 action#android.intent.action.SEARCH -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:77:17-71 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:77:25-68 meta-data#android.app.searchable -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:81:13-83:54 android:resource - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:83:17-51 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:82:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:87:9-90:43 android:authorities - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:89:13-47 android:multiprocess - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:90:13-40 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:88:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:92:9-104:20 android:label - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:94:13-50 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:93:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:95:13-99:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:96:17-84 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:96:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:97:17-85 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:97:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:98:17-85 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:98:25-82 meta-data#android.appwidget.provider -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:101:13-103:58 android:resource - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:103:17-55 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:102:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:105:9-118:20 android:label - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:107:13-50 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:106:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:120:9-124:20 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:120:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:121:13-123:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:122:17-79 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:122:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:126:9-129:20 android:process - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:128:13-38 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:127:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:131:9-136:20 android:label - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:133:13-45 android:launchMode - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:130:13-48 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:134:13-48 android:theme - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:135:13-75 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:132:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:138:9-143:20 android:label - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:136:13-54 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:140:13-54 android:launchMode - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:137:13-43 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:141:13-43 android:theme - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:138:13-60 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:142:13-60 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:135:13-71 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:139:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:145:9-148:19 android:exported - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:143:13-37 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:147:13-37 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:142:13-74 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:146:13-74 meta-data#android.app.default_searchable -ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:150:9-152:52 android:value - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:148:13-49 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:152:13-49 android:name - ADDED from D:\Notes_\app\src\main\AndroidManifest.xml:147:13-58 + ADDED from D:\Android_projects\app\src\main\AndroidManifest.xml:151:13-58 diff --git a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 9e7f100..5bdb094 100644 Binary files a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/app/src/main/java/net/micode/notes/data/Contact.java b/app/src/main/java/net/micode/notes/data/Contact.java index d97ac5d..b3b4321 100644 --- a/app/src/main/java/net/micode/notes/data/Contact.java +++ b/app/src/main/java/net/micode/notes/data/Contact.java @@ -36,6 +36,9 @@ public class Contact { + " FROM phone_lookup" + " WHERE min_match = '+')"; +/*判断是否存在映射关系 +* 若不存在，创建并存储在哈希表中 +* 存在，则返回Phonenumber*/ public static String getContact(Context context, String phoneNumber) { if(sContactCache == null) { sContactCache = new HashMap(); @@ -44,7 +47,9 @@ public class Contact { if(sContactCache.containsKey(phoneNumber)) { return sContactCache.get(phoneNumber); } - +/* +“+”号 +*/ String selection = CALLER_ID_SELECTION.replace("+", PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); Cursor cursor = context.getContentResolver().query( diff --git a/local.properties b/local.properties index 5356a8c..9b8b70e 100644 --- a/local.properties +++ b/local.properties @@ -2,6 +2,7 @@ # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. -# -#Sun Mar 26 21:27:32 CST 2023 -sdk.dir=C\:\\Users\\MikkoAyaka\\AppData\\Local\\Android\\Sdk \ No newline at end of file +# For customization when using a Version Control System, please read the +# header note. +#Fri Mar 31 16:07:00 CST 2023 +sdk.dir=C\:\\Users\\86166\\AppData\\Local\\Android\\Sdk