修改

src/Note-master2/.idea/deploymentTargetDropDown.xml

@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\86155\.android\avd\Pixel_2_XL_API_23_2.avd" />
+            <value value="C:\Users\86155\.android\avd\Pixel_2_XL_API_23_1.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-09-15T18:05:01.598576200Z" />
+    <timeTargetWasSelectedWithDropDown value="2021-09-16T06:32:05.340931100Z" />
   </component>
 </project>

src/Note-master2/app/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Note-master2\app\src\main\assets"/><source path="D:\Note-master2\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Note-master2\app\src\debug\assets"/></dataSet></merger>

src/Note-master2/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Note-master2\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Note-master2\app\src\debug\jniLibs"/></dataSet></merger>

src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

@@ -0,0 +1,96 @@
+#Thu Sep 16 14:28:45 GMT+08:00 2021
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\raw\\introduction=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat