src

2 years ago · e4162b3f71
parent 4be5f6b559
commit e4162b3f71
242 changed files with 3597 additions and 1199 deletions
--- a/src/Notes-master/.gradle/7.5/checksums/checksums.lock
+++ b/src/Notes-master/.gradle/7.5/checksums/checksums.lock
--- a/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin
+++ b/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin
--- a/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin
+++ b/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin
--- a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin
+++ b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin
--- a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock
+++ b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock
--- a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin
+++ b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin
--- a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin
+++ b/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin
--- a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
--- a/src/Notes-master/.gradle/file-system.probe
+++ b/src/Notes-master/.gradle/file-system.probe
--- a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
+++ b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
--- 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
--- a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
+++ b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
--- 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
--- 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
--- 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
@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
+    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
+    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_message_go_back_notes">确定使这 %d 个便签还原?</string>
+    <string name="alert_title_delete">删除</string>
+    <string name="app_name">便签</string>
+    <string name="app_widget2x2">便签2x2</string>
+    <string name="app_widget4x4">便签4x4</string>
+    <string name="button_delete">删除</string>
+    <string name="call_record_folder_name">通话便签</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="delete_remind_time_message">成功删除提醒</string>
+    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
+    <string name="error_note_not_exist">要查看的便签不存在</string>
+    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失败，发生内部错误</string>
+    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
+    <string name="failed_sdcard_export">导出失败</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
+    <string name="format_folder_files_count">(%d)</string>
+    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
+    <string name="hint_foler_name">请输入名称</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_create_folder">新建文件夹</string>
+    <string name="menu_default">背景：默认</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_export_text">导出文本</string>
+    <string name="menu_folder_change_name">修改文件夹名称</string>
+    <string name="menu_folder_delete">刪除文件夹</string>
+    <string name="menu_folder_view">查看文件夹</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_go_back">还原</string>
+    <string name="menu_high_hill">背景：山川</string>
+    <string name="menu_list_mode">进入清单模式</string>
+    <string name="menu_lock">设置锁</string>
+    <string name="menu_move">移动到文件夹</string>
+    <string name="menu_move_parent_folder">上一级文件夹</string>
+    <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_private_notes">设置私密密码</string>
+    <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_revoke_private_notes">取消私密密码</string>
+    <string name="menu_river">背景：河流</string>
+    <string name="menu_school_dusk">背景：校园黄昏</string>
+    <string name="menu_search">搜索</string>
+    <string name="menu_select_all">全选</string>
+    <string name="menu_select_none">没有选中项，操作无效</string>
+    <string name="menu_select_title">选中了 %d 项</string>
+    <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="menu_trash">便签回收站</string>
+    <string name="menu_unlock">移出锁</string>
+    <string name="note_alert_expired">已过期</string>
+    <string name="note_link_email">发送邮件</string>
+    <string name="note_link_other">打开地图</string>
+    <string name="note_link_tel">呼叫电话</string>
+    <string name="note_link_web">浏览网页</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便签</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便签记录</string>
+    <string name="preferences_account_title">同步账号</string>
+    <string name="preferences_add_account">添加账号</string>
+    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
+    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便签</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更换账号</string>
+    <string name="preferences_menu_remove_account">删除账号</string>
+    <string name="preferences_title">设置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
+    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
+    <string name="search">便签</string>
+    <string name="search_hint">搜索便签</string>
+    <string name="search_label">正在搜索便签</string>
+    <string name="search_setting_description">便签中的文字</string>
+    <string name="set_remind_time_message">创建提醒</string>
+    <string name="success_sdcard_export">导出成功</string>
+    <string name="success_sync_account">与%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
+    <string name="sync_progress_login">登录%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便签...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失败</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便签...</string>
+    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
+    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
+</resources>
--- 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
@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="format_for_exported_note">
+        <item>-%s</item>      
+        <item>--%s</item>     
+        <item>--%s</item>     
+        <item>--%s</item>     
+    </string-array>
+    <string-array name="menu_share_ways">
+        <item>Messaging</item>
+        <item>Email</item>
+    </string-array>
+    <color name="user_query_highlight">#335b5b5b</color>
+    <dimen name="text_font_size_large">26sp</dimen>
+    <dimen name="text_font_size_medium">20sp</dimen>
+    <dimen name="text_font_size_normal">17sp</dimen>
+    <dimen name="text_font_size_small">14sp</dimen>
+    <dimen name="text_font_size_super">33sp</dimen>
+    <plurals name="search_results_title">
+         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+        
+        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+    </plurals>
+    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
+    <string name="alert_message_delete_note">Confirm to delete this note?</string>
+    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
+    <string name="alert_message_go_back_notes">Confirm to make the selected %d notes go back?</string>
+    <string name="alert_title_delete">Delete selected notes</string>
+    <string name="app_name">Notes</string>
+    <string name="app_widget2x2">Notes 2x2</string>
+    <string name="app_widget4x4">Notes 4x4</string>
+    <string name="button_delete">Delete</string>
+    <string name="call_record_folder_name">Call notes</string>
+    <string name="datetime_dialog_cancel">cancel</string>
+    <string name="datetime_dialog_ok">set</string>
+    <string name="delete_remind_time_message">Delete reminder successfully</string>
+    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
+    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
+    <string name="error_note_not_exist">The note is not exist</string>
+    <string name="error_sdcard_export">Export failed, please check SD card</string>
+    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
+    <string name="error_sync_cancelled">Sync is canceled</string>
+    <string name="error_sync_internal">Sync failed, internal error occurs</string>
+    <string name="error_sync_network">Sync failed, please check network and account settings</string>
+    <string name="failed_sdcard_export">Export fail</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="folder_exist">The folder %1$s exist, please rename</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MMMd kk:mm</string>
+    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
+    <string name="format_folder_files_count">(%d)</string>
+    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
+    <string name="hint_foler_name">Input name</string>
+    <string name="info_note_enter_desktop">Note added to home</string>
+    <string name="menu_alert">Remind me</string>
+    <string name="menu_create_folder">New Folder</string>
+    <string name="menu_default">bg:default</string>
+    <string name="menu_delete">Delete</string>
+    <string name="menu_deselect_all">Deselect all</string>
+    <string name="menu_export_text">Export text</string>
+    <string name="menu_folder_change_name">Change folder name</string>
+    <string name="menu_folder_delete">Delete folder</string>
+    <string name="menu_folder_view">View folder</string>
+    <string name="menu_font_large">Large</string>
+    <string name="menu_font_normal">Medium</string>
+    <string name="menu_font_size">Font size</string>
+    <string name="menu_font_small">Small</string>
+    <string name="menu_font_super">Super</string>
+    <string name="menu_go_back">go back</string>
+    <string name="menu_high_hill">bg:high_hill</string>
+    <string name="menu_list_mode">Enter check list</string>
+    <string name="menu_lock">set lock</string>
+    <string name="menu_move">Move to folder</string>
+    <string name="menu_move_parent_folder">Parent folder</string>
+    <string name="menu_normal_mode">Leave check list</string>
+    <string name="menu_private_notes">set private note password</string>
+    <string name="menu_remove_remind">Delete reminder</string>
+    <string name="menu_revoke_private_notes">revoke private note password</string>
+    <string name="menu_river">bg:river</string>
+    <string name="menu_school_dusk">bg:school_dusk</string>
+    <string name="menu_search">Search</string>
+    <string name="menu_select_all">Select all</string>
+    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
+    <string name="menu_select_title">%d selected</string>
+    <string name="menu_send_to_desktop">Send to home</string>
+    <string name="menu_setting">Settings</string>
+    <string name="menu_share">Share</string>
+    <string name="menu_sync">Sync</string>
+    <string name="menu_sync_cancel">Cancel syncing</string>
+    <string name="menu_title_select_folder">Select folder</string>
+    <string name="menu_trash">trash</string>
+    <string name="menu_unlock">remove lock</string>
+    <string name="note_alert_expired">Expired</string>
+    <string name="note_link_email">Send email</string>
+    <string name="note_link_other">Open map</string>
+    <string name="note_link_tel">Call</string>
+    <string name="note_link_web">Browse web</string>
+    <string name="notealert_enter">Take a look</string>
+    <string name="notealert_ok">Got it</string>
+    <string name="notelist_menu_new">Add note</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">Sync notes with google task</string>
+    <string name="preferences_account_title">Sync account</string>
+    <string name="preferences_add_account">Add account</string>
+    <string name="preferences_bg_random_appear_title">New note background color random</string>
+    <string name="preferences_button_sync_cancel">Cancel syncing</string>
+    <string name="preferences_button_sync_immediately">Sync immediately</string>
+    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
+    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
+    <string name="preferences_dialog_select_account_title">Sync notes</string>
+    <string name="preferences_last_sync_time">Last sync time %1$s</string>
+    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_menu_cancel">Cancel</string>
+    <string name="preferences_menu_change_account">Change sync account</string>
+    <string name="preferences_menu_remove_account">Remove sync account</string>
+    <string name="preferences_title">Settings</string>
+    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
+    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
+    <string name="search">Notes</string>
+    <string name="search_hint">Search notes</string>
+    <string name="search_label">Searching Notes</string>
+    <string name="search_setting_description">Text in your notes</string>
+    <string name="set_remind_time_message">Set reminder</string>
+    <string name="success_sdcard_export">Export successful</string>
+    <string name="success_sync_account">Sync is successful with account %1$s</string>
+    <string name="sync_progress_init_list">Getting remote note list...</string>
+    <string name="sync_progress_login">Logging into %1$s...</string>
+    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
+    <string name="ticker_cancel">Sync is canceled</string>
+    <string name="ticker_fail">Sync is failed</string>
+    <string name="ticker_success">Sync is successful</string>
+    <string name="ticker_syncing">Syncing notes...</string>
+    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
+    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
+    <style name="HighlightTextAppearancePrimary">
+    <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="HighlightTextAppearanceSecondary">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+  
+        <item name="android:visibility">visible</item>
+    </style>
+    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
+    </style>
+    <style name="TextAppearanceLarge">
+        <item name="android:textSize">@dimen/text_font_size_large</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceMedium">
+        <item name="android:textSize">@dimen/text_font_size_medium</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceNormal">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearancePrimaryItem">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSecondaryItem">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSuper">
+        <item name="android:textSize">@dimen/text_font_size_super</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceUnderMenuIcon">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+</resources>
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@ -1,4 +1,4 @@
-#Sat May 20 14:13:32 CST 2023
+#Thu Jun 08 10:42:28 CST 2023
 base.0=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$3.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$3.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$4.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$4.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordLockActivity$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordLockActivity$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordLockActivity$2.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordLockActivity$2.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordLockActivity$3.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordLockActivity$3.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordLockActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordLockActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/TrashNoteActivity$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/TrashNoteActivity$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/TrashNoteActivity$HeadViewHolder.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/TrashNoteActivity$HeadViewHolder.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/TrashNoteActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/TrashNoteActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
--- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@ -20,255 +20,302 @@
 20    android:versionName="0.1" >
 21
 22    <uses-sdk
-22-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+22-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:24:5-44
 23        android:minSdkVersion="14"
-23-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
+23-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:24:15-41
 24        android:targetSdkVersion="29" />
-24-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+24-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:24:5-44
 25
 26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
-26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
+26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-81
+26-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-78
 27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
-27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
+27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-88
+27-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-85
 28    <uses-permission android:name="android.permission.INTERNET" />
-28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
-28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
+28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-67
+28-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-64
 29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
-29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
+29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-72
+29-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-69
 30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
-30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
+30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-74
+30-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-71
 31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
-31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
+31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-80
+31-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-77
 32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
-32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
+32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-71
+32-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-68
 33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
-33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
+33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-74
+33-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-71
 34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
-34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
+34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:34:5-81
+34-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:34:22-78
 35
 36    <application
-36-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
+36-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:36:5-179:19
 37        android:debuggable="true"
 38        android:icon="@drawable/icon_app"
-38-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
+38-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-42
 39        android:label="@string/app_name"
-39-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
+39-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-41
 40        android:testOnly="true" >
 41        <activity
-41-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20
+41-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:39:9-52:20
 42            android:name="net.micode.notes.ui.NotesListActivity"
-42-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
+42-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-49
 43            android:configChanges="keyboardHidden|orientation|screenSize"
-43-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
+43-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-74
 44            android:label="@string/app_name"
-44-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
+44-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-45
 45            android:launchMode="singleTop"
-45-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
+45-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-43
 46            android:theme="@style/NoteTheme"
-46-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
-47            android:uiOptions="splitActionBarWhenNarrow"
-47-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-57
-48            android:windowSoftInputMode="adjustPan" >
-48-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:45:13-52
-49            <intent-filter>
-49-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29
-50                <action android:name="android.intent.action.MAIN" />
-50-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-69
-50-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:48:25-66
-51
-52                <category android:name="android.intent.category.LAUNCHER" />
-52-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:17-77
-52-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:27-74
-53            </intent-filter>
-54        </activity>
-55        <activity
-55-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20
-56            android:name="net.micode.notes.ui.NoteEditActivity"
-56-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-48
-57            android:configChanges="keyboardHidden|orientation|screenSize"
-57-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-74
-58            android:launchMode="singleTop"
-58-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
-59            android:theme="@style/NoteTheme" >
-59-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
-60            <intent-filter android:scheme="http" >
-60-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29
-60-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:59:28-49
-61                <action android:name="android.intent.action.VIEW" />
-61-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-69
-61-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:60:25-66
-62
-63                <category android:name="android.intent.category.DEFAULT" />
-63-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
-63-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
-64
-65                <data android:mimeType="vnd.android.cursor.item/text_note" />
-65-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
-65-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
-66                <data android:mimeType="vnd.android.cursor.item/call_note" />
-66-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
-66-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
+46-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-45
+47            android:windowSoftInputMode="adjustPan" >
+47-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:45:13-52
+48
+49            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
+50
+51            <intent-filter>
+51-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:48:13-51:29
+52                <action android:name="android.intent.action.MAIN" />
+52-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:17-69
+52-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:49:25-66
+53
+54                <category android:name="android.intent.category.LAUNCHER" />
+54-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:50:17-77
+54-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:50:27-74
+55            </intent-filter>
+56        </activity>
+57        <activity
+57-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:54:9-65:20
+58            android:name="net.micode.notes.ui.PasswordLockActivity"
+58-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-52
+59            android:configChanges="keyboardHidden|orientation|screenSize"
+59-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-74
+60            android:launchMode="singleTop"
+60-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-43
+61            android:theme="@style/NoteTheme"
+61-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-45
+62            android:windowSoftInputMode="stateHidden" >
+62-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:59:13-54
+63            <intent-filter>
+63-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:13-64:29
+64                <action android:name="android.intent.action.VIEW" />
+64-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-69
+64-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:25-66
+65
+66                <category android:name="android.intent.category.DEFAULT" />
+66-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:17-76
+66-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:27-73
 67            </intent-filter>
-68            <intent-filter>
-68-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29
-69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-69-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:67:17-79
-69-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:67:25-76
-70
-71                <category android:name="android.intent.category.DEFAULT" />
-71-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
-71-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
-72
-73                <data android:mimeType="vnd.android.cursor.item/text_note" />
-73-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
-73-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
-74                <data android:mimeType="vnd.android.cursor.item/call_note" />
-74-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
-74-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
-75            </intent-filter>
-76            <intent-filter>
-76-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29
-77                <action android:name="android.intent.action.SEARCH" />
-77-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:74:17-71
-77-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:74:25-68
-78
-79                <category android:name="android.intent.category.DEFAULT" />
-79-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
-79-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
-80            </intent-filter>
-81
-82            <meta-data
-82-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54
-83                android:name="android.app.searchable"
-83-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-54
-84                android:resource="@xml/searchable" />
-84-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:80:17-51
-85        </activity>
-86
-87        <provider
-87-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43
-88            android:name="net.micode.notes.data.NotesProvider"
-88-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-63
-89            android:authorities="micode_notes"
-89-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-47
-90            android:multiprocess="true" />
-90-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:86:13-40
-91
-92        <receiver
-92-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20
-93            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-93-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-57
-94            android:label="@string/app_widget2x2" >
-94-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-50
-95            <intent-filter>
-95-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
-96                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-96-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
-96-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
-97                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-97-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-97-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
-98                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-98-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
-98-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
-99            </intent-filter>
-100
-101            <meta-data
-101-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
-102                android:name="android.appwidget.provider"
-102-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
-103                android:resource="@xml/widget_2x_info" />
-103-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
-104        </receiver>
-105        <receiver
-105-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20
-106            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-106-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-57
-107            android:label="@string/app_widget4x4" >
-107-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:103:13-50
-108            <intent-filter>
-108-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
-109                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-109-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
-109-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
-110                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-110-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-110-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
-111                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-111-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
-111-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
-112            </intent-filter>
-113
-114            <meta-data
-114-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
-115                android:name="android.appwidget.provider"
-115-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
-116                android:resource="@xml/widget_4x_info" />
-116-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
-117        </receiver>
-118        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-118-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20
-118-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:116:19-55
-119            <intent-filter>
-119-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29
-120                <action android:name="android.intent.action.BOOT_COMPLETED" />
-120-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-79
-120-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-76
-121            </intent-filter>
-122        </receiver>
-123        <receiver
-123-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20
-124            android:name="net.micode.notes.ui.AlarmReceiver"
-124-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-61
-125            android:process=":remote" >
-125-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:124:13-38
-126        </receiver>
-127
-128        <activity
-128-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20
-129            android:name="net.micode.notes.ui.AlarmAlertActivity"
-129-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-50
-130            android:label="@string/app_name"
-130-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-45
-131            android:launchMode="singleInstance"
-131-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-48
-132            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-132-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:131:13-75
-133        </activity>
-134        <activity
-134-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20
-135            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-135-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-71
-136            android:label="@string/preferences_title"
-136-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-54
-137            android:launchMode="singleTop"
-137-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-43
-138            android:theme="@android:style/Theme.Holo.Light" >
-138-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:138:13-60
-139        </activity>
-140
-141        <service
-141-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
-142            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
-143            android:exported="false" >
-143-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
-144        </service>
-145
-146        <meta-data
-146-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
-147            android:name="android.app.default_searchable"
-147-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
-148            android:value=".ui.NoteEditActivity" />
-148-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
-149    </application>
-150
-151</manifest>
+68        </activity>
+69        <activity
+69-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:67:9-78:20
+70            android:name="net.micode.notes.ui.TrashNoteActivity"
+70-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:68:13-49
+71            android:configChanges="keyboardHidden|orientation|screenSize"
+71-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:69:13-74
+72            android:launchMode="singleTop"
+72-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:70:13-43
+73            android:theme="@style/NoteTheme"
+73-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:71:13-45
+74            android:windowSoftInputMode="stateHidden" >
+74-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-54
+75            <intent-filter>
+75-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:61:13-64:29
+76                <action android:name="android.intent.action.VIEW" />
+76-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-69
+76-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:25-66
+77
+78                <category android:name="android.intent.category.DEFAULT" />
+78-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:17-76
+78-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:27-73
+79            </intent-filter>
+80        </activity>
+81        <activity
+81-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:80:9-110:20
+82            android:name="net.micode.notes.ui.NoteEditActivity"
+82-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:81:13-48
+83            android:configChanges="keyboardHidden|orientation|screenSize"
+83-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:82:13-74
+84            android:launchMode="singleTop"
+84-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-43
+85            android:theme="@style/NoteTheme" >
+85-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-45
+86            <intent-filter android:scheme="http" >
+86-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:86:13-93:29
+86-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:87:17-38
+87                <action android:name="android.intent.action.VIEW" />
+87-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-69
+87-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:62:25-66
+88
+89                <category android:name="android.intent.category.DEFAULT" />
+89-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:17-76
+89-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:27-73
+90
+91                <data android:mimeType="vnd.android.cursor.item/text_note" />
+91-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-78
+91-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:23-75
+92                <data android:mimeType="vnd.android.cursor.item/call_note" />
+92-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-78
+92-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:23-75
+93            </intent-filter>
+94            <intent-filter>
+94-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:95:13-100:29
+95                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+95-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:96:17-79
+95-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:96:25-76
+96
+97                <category android:name="android.intent.category.DEFAULT" />
+97-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:17-76
+97-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:27-73
+98
+99                <data android:mimeType="vnd.android.cursor.item/text_note" />
+99-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-78
+99-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:23-75
+100                <data android:mimeType="vnd.android.cursor.item/call_note" />
+100-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-78
+100-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:91:23-75
+101            </intent-filter>
+102            <intent-filter>
+102-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-105:29
+103                <action android:name="android.intent.action.SEARCH" />
+103-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:103:17-71
+103-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:103:25-68
+104
+105                <category android:name="android.intent.category.DEFAULT" />
+105-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:17-76
+105-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:63:27-73
+106            </intent-filter>
+107
+108            <meta-data
+108-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:107:13-109:54
+109                android:name="android.app.searchable"
+109-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:108:17-54
+110                android:resource="@xml/searchable" />
+110-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:109:17-51
+111        </activity>
+112
+113        <provider
+113-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:112:9-115:43
+114            android:name="net.micode.notes.data.NotesProvider"
+114-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:113:13-63
+115            android:authorities="micode_notes"
+115-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:114:13-47
+116            android:multiprocess="true" />
+116-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:115:13-40
+117
+118        <receiver
+118-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:117:9-129:20
+119            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+119-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:118:13-57
+120            android:label="@string/app_widget2x2" >
+120-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:119:13-50
+121            <intent-filter>
+121-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:120:13-124:29
+122                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+122-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:121:17-84
+122-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:121:25-81
+123                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+123-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:122:17-85
+123-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:122:25-82
+124                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+124-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:123:17-85
+124-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:123:25-82
+125            </intent-filter>
+126
+127            <meta-data
+127-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:126:13-128:58
+128                android:name="android.appwidget.provider"
+128-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:127:17-58
+129                android:resource="@xml/widget_2x_info" />
+129-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:128:17-55
+130        </receiver>
+131        <receiver
+131-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:130:9-143:20
+132            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+132-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:131:13-57
+133            android:label="@string/app_widget4x4" >
+133-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:132:13-50
+134            <intent-filter>
+134-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:120:13-124:29
+135                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+135-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:121:17-84
+135-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:121:25-81
+136                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+136-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:122:17-85
+136-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:122:25-82
+137                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+137-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:123:17-85
+137-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:123:25-82
+138            </intent-filter>
+139
+140            <meta-data
+140-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:126:13-128:58
+141                android:name="android.appwidget.provider"
+141-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:127:17-58
+142                android:resource="@xml/widget_4x_info" />
+142-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:128:17-55
+143        </receiver>
+144        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+144-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-149:20
+144-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:145:19-55
+145            <intent-filter>
+145-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-148:29
+146                <action android:name="android.intent.action.BOOT_COMPLETED" />
+146-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:147:17-79
+146-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:147:25-76
+147            </intent-filter>
+148        </receiver>
+149        <receiver
+149-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:151:9-154:20
+150            android:name="net.micode.notes.ui.AlarmReceiver"
+150-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:152:13-61
+151            android:process=":remote" >
+151-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:153:13-38
+152        </receiver>
+153
+154        <activity
+154-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:156:9-161:20
+155            android:name="net.micode.notes.ui.AlarmAlertActivity"
+155-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:157:13-50
+156            android:label="@string/app_name"
+156-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:158:13-45
+157            android:launchMode="singleInstance"
+157-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:159:13-48
+158            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+158-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:160:13-75
+159        </activity>
+160        <activity
+160-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:163:9-168:20
+161            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+161-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:164:13-71
+162            android:label="@string/preferences_title"
+162-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:165:13-54
+163            android:launchMode="singleTop"
+163-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:166:13-43
+164            android:theme="@android:style/Theme.Holo.Light" >
+164-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:167:13-60
+165        </activity>
+166
+167        <service
+167-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:170:9-173:19
+168            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+168-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:171:13-74
+169            android:exported="false" >
+169-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:172:13-37
+170        </service>
+171
+172        <meta-data
+172-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:175:9-177:52
+173            android:name="android.app.default_searchable"
+173-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:176:13-58
+174            android:value=".ui.NoteEditActivity" />
+174-->D:\programming\gitProject1\src\Notes-master\app\src\main\AndroidManifest.xml:177:13-49
+175    </application>
+176
+177</manifest>
--- a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@ -44,14 +44,40 @@
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
            android:windowSoftInputMode="adjustPan" >
+
+            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
+
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
+        <activity
+            android:name="net.micode.notes.ui.PasswordLockActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTop"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="stateHidden" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="net.micode.notes.ui.TrashNoteActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTop"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="stateHidden" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
        <activity
            android:name="net.micode.notes.ui.NoteEditActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
--- a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@ -44,14 +44,40 @@
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
            android:windowSoftInputMode="adjustPan" >
+
+            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
+
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
+        <activity
+            android:name="net.micode.notes.ui.PasswordLockActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTop"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="stateHidden" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="net.micode.notes.ui.TrashNoteActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTop"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="stateHidden" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
        <activity
            android:name="net.micode.notes.ui.NoteEditActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_high_hill.png.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_high_hill.png.flat
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_lock.png.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_lock.png.flat
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_unlock.png.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_unlock.png.flat
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_password_lock_background.png.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_password_lock_background.png.flat
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_password_lock_note.png.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_password_lock_note.png.flat
--- a/Show More
+++ b/Show More