diff --git a/src/Notes-master/.gradle/7.5/checksums/checksums.lock b/src/Notes-master/.gradle/7.5/checksums/checksums.lock index 5b128bb..b114ff5 100644 Binary files a/src/Notes-master/.gradle/7.5/checksums/checksums.lock and b/src/Notes-master/.gradle/7.5/checksums/checksums.lock differ diff --git a/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin index 39d089c..915a137 100644 Binary files a/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin and b/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin index 2487d0d..911d735 100644 Binary files a/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin and b/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin index 6499e7c..df71088 100644 Binary files a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin and b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock index f52c732..cfe8feb 100644 Binary files a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock and b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin index ab1799b..81ff41b 100644 Binary files a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin and b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock index 8e10598..4e76303 100644 Binary files a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock and b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin index b2911ef..06c4109 100644 Binary files a/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index bfd9029..f084d27 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin index 5b20e93..02897b6 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master/.gradle/file-system.probe b/src/Notes-master/.gradle/file-system.probe index c1546c6..ff12343 100644 Binary files a/src/Notes-master/.gradle/file-system.probe and b/src/Notes-master/.gradle/file-system.probe differ diff --git a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk index 8f4b7d1..e0902dd 100644 Binary files a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 7acdbec..5d29aa6 100644 Binary files a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 0133c8a..299a90b 100644 Binary files a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 5c96fa2..3b36f72 100644 Binary files a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 5f2af49..af2e9da 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,110 @@ -#Sat May 20 13:22:35 CST 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +#Thu Jun 08 10:42:17 CST 2023 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_lock.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_lock.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/password_lock_note.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_password_lock_note.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable/unlock_button_background.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_unlock_button_background.xml.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/menu/trash_folder.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/layout/passwordlock_note.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_passwordlock_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/unlock.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_unlock.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_unlock.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_unlock.png.flat +net.micode.notes.app-main-7\:/menu/trash_note.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_note.xml.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/high_hill.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_high_hill.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/lock.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/school_dusk.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_school_dusk.png.flat net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/river.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_river.png.flat +net.micode.notes.app-main-7\:/layout/dialog_pwd.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_pwd.xml.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\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\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/password_lock_background.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_password_lock_background.png.flat diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 0000000..6a234c7 --- /dev/null +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,123 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗？ + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 确定使这 %d 个便签还原? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误，请检查SD卡 + SD卡被占用，不能操作 + 同步已取消 + 同步失败，发生内部错误 + 同步失败，请检查网络和帐号设置 + 导出失败 + notes_%s.txt + /MIUI/notes/ + 文件夹 %1$s 已存在，请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + (%d) + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 提醒我 + 新建文件夹 + 背景：默认 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + 大 + 正常 + 文字大小 + 小 + 超大 + 还原 + 背景：山川 + 进入清单模式 + 设置锁 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 设置私密密码 + 删除提醒 + 取消私密密码 + 背景：河流 + 背景：校园黄昏 + 搜索 + 全选 + 没有选中项，操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 便签回收站 + 移出锁 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 + 请选择google帐号，便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + yyyy-MM-dd hh:mm:ss + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中，不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容，点击新建便签。 + 访客模式下，便签内容不可见 + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml new file mode 100644 index 0000000..85755ce --- /dev/null +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -0,0 +1,180 @@ + + + + -%s + --%s + --%s + --%s + + + Messaging + Email + + #335b5b5b + 26sp + 20sp + 17sp + 14sp + 33sp + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + Confirm to delete folder and its notes? + Confirm to delete this note? + Confirm to delete the selected %d notes? + Confirm to make the selected %d notes go back? + Delete selected notes + Notes + Notes 2x2 + Notes 4x4 + Delete + Call notes + cancel + set + Delete reminder successfully + Sorry, can not set clock on empty note + Sorry, can not send and empty note to home + The note is not exist + Export failed, please check SD card + SD card busy, not available now + Sync is canceled + Sync failed, internal error occurs + Sync failed, please check network and account settings + Export fail + notes_%s.txt + /MIUI/notes/ + The folder %1$s exist, please rename + yyyyMMdd + MMMd kk:mm + Export text file (%1$s) to SD (%2$s) directory + (%d) + Have moved selected %1$d notes to %2$s folder + Input name + Note added to home + Remind me + New Folder + bg:default + Delete + Deselect all + Export text + Change folder name + Delete folder + View folder + Large + Medium + Font size + Small + Super + go back + bg:high_hill + Enter check list + set lock + Move to folder + Parent folder + Leave check list + set private note password + Delete reminder + revoke private note password + bg:river + bg:school_dusk + Search + Select all + Nothing selected, the operation is invalid + %d selected + Send to home + Settings + Share + Sync + Cancel syncing + Select folder + trash + remove lock + Expired + Send email + Open map + Call + Browse web + Take a look + Got it + Add note + ... + Sync notes with google task + Sync account + Add account + New note background color random + Cancel syncing + Sync immediately + Current account %1$s + All sync related information will be deleted, which may result in duplicated items sometime + Please select a google account. Local notes will be synced with google task. + Sync notes + Last sync time %1$s + yyyy-MM-dd hh:mm:ss + Cancel + Change sync account + Remove sync account + Settings + Cannot change the account because sync is in progress + %1$s has been set as the sync account + Notes + Search notes + Searching Notes + Text in your notes + Set reminder + Export successful + Sync is successful with account %1$s + Getting remote note list... + Logging into %1$s... + Synchronize local notes with Google Task... + Sync is canceled + Sync is failed + Sync is successful + Syncing notes... + No associated note found, click to create associated note. + Privacy mode，can not see note content + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 8b1d5b3..aff4f86 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -11,7 +11,7 @@ %1$s result for \"%2$s\" %1$s results for \"%2$s\" - quit secret modelsecret model