master
陈@jkccchen123 1 year ago
commit b186b12274

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\86139\.android\avd\Pixel_2.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-01-04T02:28:43.057211200Z" />
</component>
</project>

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RenderSettings">
<option name="showDecorations" value="true" />
</component>
</project>

@ -1,3 +1,4 @@
<<<<<<< HEAD
#Tue Jan 16 14:46:52 CST 2024
net.micode.notes.app-main-7\:/color/primary_text_dark.xml=E\:\\JK_PC\\STUDY\\software engineering\\mi_note\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=E\:\\JK_PC\\STUDY\\software engineering\\mi_note\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
@ -98,3 +99,104 @@ net.micode.notes.app-mergeDebugResources-4\:/layout/note_list_footer.xml=E\:\\JK
net.micode.notes.app-mergeDebugResources-4\:/layout/settings_header.xml=E\:\\JK_PC\\STUDY\\software engineering\\mi_note\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
net.micode.notes.app-mergeDebugResources-4\:/layout/widget_2x.xml=E\:\\JK_PC\\STUDY\\software engineering\\mi_note\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
net.micode.notes.app-mergeDebugResources-4\:/layout/widget_4x.xml=E\:\\JK_PC\\STUDY\\software engineering\\mi_note\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
=======
#Sun Jan 07 22:29:33 CST 2024
net.micode.notes.app-main-6\:/color/primary_text_dark.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/grass.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_grass.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/lanyangyang.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lanyangyang.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/playground1.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_playground1.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
net.micode.notes.app-main-6\:/drawable/new_note.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
net.micode.notes.app-main-6\:/layout/add_account_text.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
net.micode.notes.app-main-6\:/layout/datetime_picker.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
net.micode.notes.app-main-6\:/layout/folder_list_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
net.micode.notes.app-main-6\:/layout/note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
net.micode.notes.app-main-6\:/layout/note_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
net.micode.notes.app-main-6\:/layout/note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
net.micode.notes.app-main-6\:/layout/note_list_footer.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
net.micode.notes.app-main-6\:/layout/settings_header.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
net.micode.notes.app-main-6\:/layout/widget_2x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
net.micode.notes.app-main-6\:/layout/widget_4x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
net.micode.notes.app-main-6\:/menu/call_note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
net.micode.notes.app-main-6\:/menu/call_record_folder.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
net.micode.notes.app-main-6\:/menu/note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
net.micode.notes.app-main-6\:/menu/note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
net.micode.notes.app-main-6\:/menu/note_list_options.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
net.micode.notes.app-main-6\:/menu/sub_folder.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
net.micode.notes.app-main-6\:/raw/introduction=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
net.micode.notes.app-main-6\:/xml/preferences.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
net.micode.notes.app-main-6\:/xml/searchable.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
>>>>>>> 6e3c0ac64d4353056b0d608b98107da959497c89

@ -1,3 +1,4 @@
<<<<<<< HEAD
#Tue Jan 16 14:46:53 CST 2024
net.micode.notes.app-main-5\:/color/primary_text_dark.xml=E\:\\JK_PC\\STUDY\\software engineering\\mi_note\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=E\:\\JK_PC\\STUDY\\software engineering\\mi_note\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
@ -98,3 +99,104 @@ net.micode.notes.app-packageDebugResources-2\:/layout/note_list_footer.xml=E\:\\
net.micode.notes.app-packageDebugResources-2\:/layout/settings_header.xml=E\:\\JK_PC\\STUDY\\software engineering\\mi_note\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
net.micode.notes.app-packageDebugResources-2\:/layout/widget_2x.xml=E\:\\JK_PC\\STUDY\\software engineering\\mi_note\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
net.micode.notes.app-packageDebugResources-2\:/layout/widget_4x.xml=E\:\\JK_PC\\STUDY\\software engineering\\mi_note\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
=======
#Sun Jan 07 22:29:33 CST 2024
net.micode.notes.app-main-5\:/color/primary_text_dark.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
net.micode.notes.app-main-5\:/drawable-hdpi/grass.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\grass.png
net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
net.micode.notes.app-main-5\:/drawable-hdpi/lanyangyang.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\lanyangyang.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
net.micode.notes.app-main-5\:/drawable-hdpi/playground1.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\playground1.png
net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
net.micode.notes.app-main-5\:/drawable/new_note.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
net.micode.notes.app-main-5\:/layout/add_account_text.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
net.micode.notes.app-main-5\:/layout/datetime_picker.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
net.micode.notes.app-main-5\:/layout/folder_list_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
net.micode.notes.app-main-5\:/layout/note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
net.micode.notes.app-main-5\:/layout/note_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
net.micode.notes.app-main-5\:/layout/note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
net.micode.notes.app-main-5\:/layout/note_list_footer.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
net.micode.notes.app-main-5\:/layout/settings_header.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
net.micode.notes.app-main-5\:/layout/widget_2x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
net.micode.notes.app-main-5\:/layout/widget_4x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
net.micode.notes.app-main-5\:/menu/call_note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
net.micode.notes.app-main-5\:/menu/call_record_folder.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
net.micode.notes.app-main-5\:/menu/note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
net.micode.notes.app-main-5\:/menu/note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
net.micode.notes.app-main-5\:/menu/note_list_options.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
net.micode.notes.app-main-5\:/menu/sub_folder.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
net.micode.notes.app-main-5\:/raw/introduction=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
net.micode.notes.app-main-5\:/xml/preferences.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
net.micode.notes.app-main-5\:/xml/searchable.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
>>>>>>> 6e3c0ac64d4353056b0d608b98107da959497c89

@ -1,4 +1,9 @@
<<<<<<< HEAD
#Tue Jan 16 14:48:08 CST 2024
base.0=E\:\\JK_PC\\STUDY\\software engineering\\mi_note\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
=======
#Fri Jan 12 11:50:33 CST 2024
base.0=E\:\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> 6e3c0ac64d4353056b0d608b98107da959497c89
path.0=classes.dex
renamed.0=classes.dex

@ -68,8 +68,17 @@
"source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml"
},
{
<<<<<<< HEAD
"merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat",
"source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml"
=======
"merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat",
"source": "net.micode.notes.app-main-6:/layout/note_edit.xml"
},
{
"merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_green.9.png.flat",
"source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_green.9.png"
>>>>>>> 6e3c0ac64d4353056b0d608b98107da959497c89
},
{
"merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat",
@ -104,12 +113,17 @@
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png"
},
{
<<<<<<< HEAD
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png"
},
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png"
=======
"merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_edit.xml.flat",
"source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_edit.xml"
>>>>>>> 6e3c0ac64d4353056b0d608b98107da959497c89
},
{
"merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat",

@ -1,3 +1,4 @@
<<<<<<< HEAD
int anim abc_fade_in 0x7f010000
int anim abc_fade_out 0x7f010001
int anim abc_grow_fade_in_from_bottom 0x7f010002
@ -1573,3 +1574,298 @@ int xml preferences 0x7f110000
int xml searchable 0x7f110001
int xml widget_2x_info 0x7f110002
int xml widget_4x_info 0x7f110003
=======
int array format_for_exported_note 0x7f010000
int array menu_share_ways 0x7f010001
int color primary_text_dark 0x7f020000
int color secondary_text_dark 0x7f020001
int color user_query_highlight 0x7f020002
int dimen text_font_size_large 0x7f030000
int dimen text_font_size_medium 0x7f030001
int dimen text_font_size_normal 0x7f030002
int dimen text_font_size_small 0x7f030003
int dimen text_font_size_super 0x7f030004
int drawable bg_btn_set_color 0x7f040000
int drawable bg_color_btn_mask 0x7f040001
int drawable call_record 0x7f040002
int drawable clock 0x7f040003
int drawable delete 0x7f040004
int drawable dropdown_icon 0x7f040005
int drawable edit_blue 0x7f040006
int drawable edit_green 0x7f040007
int drawable edit_red 0x7f040008
int drawable edit_title_blue 0x7f040009
int drawable edit_title_green 0x7f04000a
int drawable edit_title_red 0x7f04000b
int drawable edit_title_white 0x7f04000c
int drawable edit_title_yellow 0x7f04000d
int drawable edit_white 0x7f04000e
int drawable edit_yellow 0x7f04000f
int drawable font_large 0x7f040010
int drawable font_normal 0x7f040011
int drawable font_size_selector_bg 0x7f040012
int drawable font_small 0x7f040013
int drawable font_super 0x7f040014
int drawable grass 0x7f040015
int drawable icon_app 0x7f040016
int drawable lanyangyang 0x7f040017
int drawable list_background 0x7f040018
int drawable list_blue_down 0x7f040019
int drawable list_blue_middle 0x7f04001a
int drawable list_blue_single 0x7f04001b
int drawable list_blue_up 0x7f04001c
int drawable list_folder 0x7f04001d
int drawable list_footer_bg 0x7f04001e
int drawable list_green_down 0x7f04001f
int drawable list_green_middle 0x7f040020
int drawable list_green_single 0x7f040021
int drawable list_green_up 0x7f040022
int drawable list_red_down 0x7f040023
int drawable list_red_middle 0x7f040024
int drawable list_red_single 0x7f040025
int drawable list_red_up 0x7f040026
int drawable list_white_down 0x7f040027
int drawable list_white_middle 0x7f040028
int drawable list_white_single 0x7f040029
int drawable list_white_up 0x7f04002a
int drawable list_yellow_down 0x7f04002b
int drawable list_yellow_middle 0x7f04002c
int drawable list_yellow_single 0x7f04002d
int drawable list_yellow_up 0x7f04002e
int drawable menu_delete 0x7f04002f
int drawable menu_move 0x7f040030
int drawable new_note 0x7f040031
int drawable new_note_normal 0x7f040032
int drawable new_note_pressed 0x7f040033
int drawable note_edit_color_selector_panel 0x7f040034
int drawable notification 0x7f040035
int drawable playground1 0x7f040036
int drawable search_result 0x7f040037
int drawable selected 0x7f040038
int drawable title_alert 0x7f040039
int drawable title_bar_bg 0x7f04003a
int drawable widget_2x_blue 0x7f04003b
int drawable widget_2x_green 0x7f04003c
int drawable widget_2x_red 0x7f04003d
int drawable widget_2x_white 0x7f04003e
int drawable widget_2x_yellow 0x7f04003f
int drawable widget_4x_blue 0x7f040040
int drawable widget_4x_green 0x7f040041
int drawable widget_4x_red 0x7f040042
int drawable widget_4x_white 0x7f040043
int drawable widget_4x_yellow 0x7f040044
int id account_dialog_subtitle 0x7f050000
int id account_dialog_title 0x7f050001
int id action_select_all 0x7f050002
int id amPm 0x7f050003
int id btn_new_note 0x7f050004
int id btn_set_bg_color 0x7f050005
int id cb_edit_item 0x7f050006
int id date 0x7f050007
int id delete 0x7f050008
int id et_edit_text 0x7f050009
int id et_foler_name 0x7f05000a
int id font_size_selector 0x7f05000b
int id hour 0x7f05000c
int id iv_alert_icon 0x7f05000d
int id iv_bg_blue 0x7f05000e
int id iv_bg_blue_select 0x7f05000f
int id iv_bg_green 0x7f050010
int id iv_bg_green_select 0x7f050011
int id iv_bg_red 0x7f050012
int id iv_bg_red_select 0x7f050013
int id iv_bg_white 0x7f050014
int id iv_bg_white_select 0x7f050015
int id iv_bg_yellow 0x7f050016
int id iv_bg_yellow_select 0x7f050017
int id iv_large_select 0x7f050018
int id iv_medium_select 0x7f050019
int id iv_small_select 0x7f05001a
int id iv_super_select 0x7f05001b
int id ll_font_large 0x7f05001c
int id ll_font_normal 0x7f05001d
int id ll_font_small 0x7f05001e
int id ll_font_super 0x7f05001f
int id menu_alert 0x7f050020
int id menu_delete 0x7f050021
int id menu_delete_remind 0x7f050022
int id menu_export_text 0x7f050023
int id menu_font_size 0x7f050024
int id menu_grass 0x7f050025
int id menu_lanyangyang 0x7f050026
int id menu_list_mode 0x7f050027
int id menu_new_folder 0x7f050028
int id menu_new_note 0x7f050029
int id menu_playground1 0x7f05002a
int id menu_search 0x7f05002b
int id menu_send_to_desktop 0x7f05002c
int id menu_setting 0x7f05002d
int id menu_share 0x7f05002e
int id menu_sync 0x7f05002f
int id minute 0x7f050030
int id move 0x7f050031
int id navigation_bar 0x7f050032
int id note_bg_color_selector 0x7f050033
int id note_edit_list 0x7f050034
int id note_edit_view 0x7f050035
int id note_item 0x7f050036
int id note_title 0x7f050037
int id notes_list 0x7f050038
int id prefenerece_sync_status_textview 0x7f050039
int id preference_sync_button 0x7f05003a
int id selection_menu 0x7f05003b
int id sv_note_edit 0x7f05003c
int id text_num 0x7f05003d
int id tv_alert_date 0x7f05003e
int id tv_folder_name 0x7f05003f
int id tv_modified_date 0x7f050040
int id tv_name 0x7f050041
int id tv_time 0x7f050042
int id tv_title 0x7f050043
int id tv_title_bar 0x7f050044
int id widget_bg_image 0x7f050045
int id widget_text 0x7f050046
int layout account_dialog_title 0x7f060000
int layout add_account_text 0x7f060001
int layout datetime_picker 0x7f060002
int layout dialog_edit_text 0x7f060003
int layout folder_list_item 0x7f060004
int layout note_edit 0x7f060005
int layout note_edit_list_item 0x7f060006
int layout note_item 0x7f060007
int layout note_list 0x7f060008
int layout note_list_dropdown_menu 0x7f060009
int layout note_list_footer 0x7f06000a
int layout settings_header 0x7f06000b
int layout widget_2x 0x7f06000c
int layout widget_4x 0x7f06000d
int menu call_note_edit 0x7f070000
int menu call_record_folder 0x7f070001
int menu note_edit 0x7f070002
int menu note_list 0x7f070003
int menu note_list_dropdown 0x7f070004
int menu note_list_options 0x7f070005
int menu sub_folder 0x7f070006
int plurals search_results_title 0x7f080000
int raw introduction 0x7f090000
int string alert_message_delete_folder 0x7f0a0000
int string alert_message_delete_note 0x7f0a0001
int string alert_message_delete_notes 0x7f0a0002
int string alert_title_delete 0x7f0a0003
int string app_name 0x7f0a0004
int string app_widget2x2 0x7f0a0005
int string app_widget4x4 0x7f0a0006
int string button_delete 0x7f0a0007
int string call_record_folder_name 0x7f0a0008
int string datetime_dialog_cancel 0x7f0a0009
int string datetime_dialog_ok 0x7f0a000a
int string delete_remind_time_message 0x7f0a000b
int string error_note_empty_for_clock 0x7f0a000c
int string error_note_empty_for_send_to_desktop 0x7f0a000d
int string error_note_not_exist 0x7f0a000e
int string error_sdcard_export 0x7f0a000f
int string error_sdcard_unmounted 0x7f0a0010
int string error_sync_cancelled 0x7f0a0011
int string error_sync_internal 0x7f0a0012
int string error_sync_network 0x7f0a0013
int string failed_sdcard_export 0x7f0a0014
int string file_name_txt_format 0x7f0a0015
int string file_path 0x7f0a0016
int string folder_exist 0x7f0a0017
int string format_date_ymd 0x7f0a0018
int string format_datetime_mdhm 0x7f0a0019
int string format_exported_file_location 0x7f0a001a
int string format_folder_files_count 0x7f0a001b
int string format_move_notes_to_folder 0x7f0a001c
int string hint_foler_name 0x7f0a001d
int string info_note_enter_desktop 0x7f0a001e
int string menu_alert 0x7f0a001f
int string menu_create_folder 0x7f0a0020
int string menu_delete 0x7f0a0021
int string menu_deselect_all 0x7f0a0022
int string menu_export_text 0x7f0a0023
int string menu_folder_change_name 0x7f0a0024
int string menu_folder_delete 0x7f0a0025
int string menu_folder_view 0x7f0a0026
int string menu_font_large 0x7f0a0027
int string menu_font_normal 0x7f0a0028
int string menu_font_size 0x7f0a0029
int string menu_font_small 0x7f0a002a
int string menu_font_super 0x7f0a002b
int string menu_grass 0x7f0a002c
int string menu_lanyangyang 0x7f0a002d
int string menu_list_mode 0x7f0a002e
int string menu_move 0x7f0a002f
int string menu_move_parent_folder 0x7f0a0030
int string menu_normal_mode 0x7f0a0031
int string menu_playground1 0x7f0a0032
int string menu_remove_remind 0x7f0a0033
int string menu_search 0x7f0a0034
int string menu_select_all 0x7f0a0035
int string menu_select_none 0x7f0a0036
int string menu_select_title 0x7f0a0037
int string menu_send_to_desktop 0x7f0a0038
int string menu_setting 0x7f0a0039
int string menu_share 0x7f0a003a
int string menu_sync 0x7f0a003b
int string menu_sync_cancel 0x7f0a003c
int string menu_title_select_folder 0x7f0a003d
int string note_alert_expired 0x7f0a003e
int string note_link_email 0x7f0a003f
int string note_link_other 0x7f0a0040
int string note_link_tel 0x7f0a0041
int string note_link_web 0x7f0a0042
int string notealert_enter 0x7f0a0043
int string notealert_ok 0x7f0a0044
int string notelist_menu_new 0x7f0a0045
int string notelist_string_info 0x7f0a0046
int string preferences_account_summary 0x7f0a0047
int string preferences_account_title 0x7f0a0048
int string preferences_add_account 0x7f0a0049
int string preferences_bg_random_appear_title 0x7f0a004a
int string preferences_button_sync_cancel 0x7f0a004b
int string preferences_button_sync_immediately 0x7f0a004c
int string preferences_dialog_change_account_title 0x7f0a004d
int string preferences_dialog_change_account_warn_msg 0x7f0a004e
int string preferences_dialog_select_account_tips 0x7f0a004f
int string preferences_dialog_select_account_title 0x7f0a0050
int string preferences_last_sync_time 0x7f0a0051
int string preferences_last_sync_time_format 0x7f0a0052
int string preferences_menu_cancel 0x7f0a0053
int string preferences_menu_change_account 0x7f0a0054
int string preferences_menu_remove_account 0x7f0a0055
int string preferences_title 0x7f0a0056
int string preferences_toast_cannot_change_account 0x7f0a0057
int string preferences_toast_success_set_accout 0x7f0a0058
int string search 0x7f0a0059
int string search_hint 0x7f0a005a
int string search_label 0x7f0a005b
int string search_setting_description 0x7f0a005c
int string set_remind_time_message 0x7f0a005d
int string success_sdcard_export 0x7f0a005e
int string success_sync_account 0x7f0a005f
int string sync_progress_init_list 0x7f0a0060
int string sync_progress_login 0x7f0a0061
int string sync_progress_syncing 0x7f0a0062
int string ticker_cancel 0x7f0a0063
int string ticker_fail 0x7f0a0064
int string ticker_success 0x7f0a0065
int string ticker_syncing 0x7f0a0066
int string widget_havenot_content 0x7f0a0067
int string widget_under_visit_mode 0x7f0a0068
int style HighlightTextAppearancePrimary 0x7f0b0000
int style HighlightTextAppearanceSecondary 0x7f0b0001
int style NoteActionBarStyle 0x7f0b0002
int style NoteTheme 0x7f0b0003
int style TextAppearanceLarge 0x7f0b0004
int style TextAppearanceMedium 0x7f0b0005
int style TextAppearanceNormal 0x7f0b0006
int style TextAppearancePrimaryItem 0x7f0b0007
int style TextAppearanceSecondaryItem 0x7f0b0008
int style TextAppearanceSuper 0x7f0b0009
int style TextAppearanceUnderMenuIcon 0x7f0b000a
int xml preferences 0x7f0c0000
int xml searchable 0x7f0c0001
int xml widget_2x_info 0x7f0c0002
int xml widget_4x_info 0x7f0c0003
>>>>>>> 6e3c0ac64d4353056b0d608b98107da959497c89

@ -1,3 +1,4 @@
<<<<<<< HEAD
net.micode.notes:xml/searchable = 0x7f110001
net.micode.notes:xml/preferences = 0x7f110000
net.micode.notes:styleable/ViewStubCompat = 0x7f10001d
@ -1274,3 +1275,298 @@ net.micode.notes:attr/dropDownListViewStyle = 0x7f03005b
net.micode.notes:style/Base.TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f0022
net.micode.notes:string/hint_foler_name = 0x7f0e0035
net.micode.notes:attr/actionButtonStyle = 0x7f03000b
=======
net.micode.notes:xml/searchable = 0x7f0c0001
net.micode.notes:xml/preferences = 0x7f0c0000
net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
net.micode.notes:xml/widget_2x_info = 0x7f0c0002
net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
net.micode.notes:string/widget_under_visit_mode = 0x7f0a0068
net.micode.notes:string/sync_progress_login = 0x7f0a0061
net.micode.notes:string/success_sync_account = 0x7f0a005f
net.micode.notes:string/search_setting_description = 0x7f0a005c
net.micode.notes:string/search_hint = 0x7f0a005a
net.micode.notes:string/search = 0x7f0a0059
net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0058
net.micode.notes:string/preferences_title = 0x7f0a0056
net.micode.notes:string/preferences_menu_change_account = 0x7f0a0054
net.micode.notes:string/preferences_last_sync_time = 0x7f0a0051
net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004d
net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004a
net.micode.notes:string/preferences_add_account = 0x7f0a0049
net.micode.notes:string/preferences_account_title = 0x7f0a0048
net.micode.notes:xml/widget_4x_info = 0x7f0c0003
net.micode.notes:string/set_remind_time_message = 0x7f0a005d
net.micode.notes:string/notealert_enter = 0x7f0a0043
net.micode.notes:string/note_link_web = 0x7f0a0042
net.micode.notes:string/note_link_tel = 0x7f0a0041
net.micode.notes:string/note_link_other = 0x7f0a0040
net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004e
net.micode.notes:string/note_link_email = 0x7f0a003f
net.micode.notes:string/note_alert_expired = 0x7f0a003e
net.micode.notes:string/menu_sync_cancel = 0x7f0a003c
net.micode.notes:string/menu_sync = 0x7f0a003b
net.micode.notes:string/menu_share = 0x7f0a003a
net.micode.notes:string/menu_setting = 0x7f0a0039
net.micode.notes:string/menu_send_to_desktop = 0x7f0a0038
net.micode.notes:string/menu_select_title = 0x7f0a0037
net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
net.micode.notes:string/menu_select_all = 0x7f0a0035
net.micode.notes:string/menu_search = 0x7f0a0034
net.micode.notes:string/menu_normal_mode = 0x7f0a0031
net.micode.notes:string/menu_font_size = 0x7f0a0029
net.micode.notes:string/menu_font_small = 0x7f0a002a
net.micode.notes:string/menu_font_normal = 0x7f0a0028
net.micode.notes:string/menu_remove_remind = 0x7f0a0033
net.micode.notes:string/menu_font_large = 0x7f0a0027
net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
net.micode.notes:string/menu_export_text = 0x7f0a0023
net.micode.notes:string/menu_deselect_all = 0x7f0a0022
net.micode.notes:string/menu_create_folder = 0x7f0a0020
net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
net.micode.notes:string/success_sdcard_export = 0x7f0a005e
net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
net.micode.notes:string/format_folder_files_count = 0x7f0a001b
net.micode.notes:string/format_exported_file_location = 0x7f0a001a
net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
net.micode.notes:string/preferences_account_summary = 0x7f0a0047
net.micode.notes:string/format_date_ymd = 0x7f0a0018
net.micode.notes:string/file_name_txt_format = 0x7f0a0015
net.micode.notes:id/note_edit_list = 0x7f050034
net.micode.notes:drawable/new_note = 0x7f040031
net.micode.notes:string/folder_exist = 0x7f0a0017
net.micode.notes:string/menu_select_none = 0x7f0a0036
net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
net.micode.notes:string/ticker_cancel = 0x7f0a0063
net.micode.notes:drawable/list_red_single = 0x7f040025
net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
net.micode.notes:drawable/widget_4x_green = 0x7f040041
net.micode.notes:string/error_sdcard_export = 0x7f0a000f
net.micode.notes:string/notealert_ok = 0x7f0a0044
net.micode.notes:string/menu_move_parent_folder = 0x7f0a0030
net.micode.notes:id/tv_title = 0x7f050043
net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0055
net.micode.notes:string/button_delete = 0x7f0a0007
net.micode.notes:string/ticker_fail = 0x7f0a0064
net.micode.notes:string/search_label = 0x7f0a005b
net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004f
net.micode.notes:string/app_widget2x2 = 0x7f0a0005
net.micode.notes:string/app_name = 0x7f0a0004
net.micode.notes:string/widget_havenot_content = 0x7f0a0067
net.micode.notes:string/alert_title_delete = 0x7f0a0003
net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
net.micode.notes:layout/note_item = 0x7f060007
net.micode.notes:menu/sub_folder = 0x7f070006
net.micode.notes:menu/note_list = 0x7f070003
net.micode.notes:string/ticker_syncing = 0x7f0a0066
net.micode.notes:drawable/menu_move = 0x7f040030
net.micode.notes:id/menu_search = 0x7f05002b
net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
net.micode.notes:raw/introduction = 0x7f090000
net.micode.notes:menu/call_record_folder = 0x7f070001
net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0052
net.micode.notes:menu/call_note_edit = 0x7f070000
net.micode.notes:drawable/list_red_middle = 0x7f040024
net.micode.notes:layout/widget_2x = 0x7f06000c
net.micode.notes:layout/widget_4x = 0x7f06000d
net.micode.notes:drawable/icon_app = 0x7f040016
net.micode.notes:layout/note_list = 0x7f060008
net.micode.notes:layout/note_edit = 0x7f060005
net.micode.notes:drawable/list_background = 0x7f040018
net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
net.micode.notes:drawable/widget_2x_blue = 0x7f04003b
net.micode.notes:layout/folder_list_item = 0x7f060004
net.micode.notes:string/sync_progress_init_list = 0x7f0a0060
net.micode.notes:id/btn_new_note = 0x7f050004
net.micode.notes:layout/add_account_text = 0x7f060001
net.micode.notes:id/widget_text = 0x7f050046
net.micode.notes:id/widget_bg_image = 0x7f050045
net.micode.notes:string/menu_folder_delete = 0x7f0a0025
net.micode.notes:id/tv_name = 0x7f050041
net.micode.notes:id/tv_alert_date = 0x7f05003e
net.micode.notes:color/primary_text_dark = 0x7f020000
net.micode.notes:id/tv_time = 0x7f050042
net.micode.notes:id/selection_menu = 0x7f05003b
net.micode.notes:id/preference_sync_button = 0x7f05003a
net.micode.notes:string/error_sync_network = 0x7f0a0013
net.micode.notes:id/notes_list = 0x7f050038
net.micode.notes:drawable/playground1 = 0x7f040036
net.micode.notes:id/note_title = 0x7f050037
net.micode.notes:id/note_bg_color_selector = 0x7f050033
net.micode.notes:id/navigation_bar = 0x7f050032
net.micode.notes:id/move = 0x7f050031
net.micode.notes:id/menu_sync = 0x7f05002f
net.micode.notes:string/menu_move = 0x7f0a002f
net.micode.notes:id/date = 0x7f050007
net.micode.notes:id/note_item = 0x7f050036
net.micode.notes:id/menu_setting = 0x7f05002d
net.micode.notes:id/menu_send_to_desktop = 0x7f05002c
net.micode.notes:id/menu_share = 0x7f05002e
net.micode.notes:id/menu_playground1 = 0x7f05002a
net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
net.micode.notes:id/menu_lanyangyang = 0x7f050026
net.micode.notes:id/note_edit_view = 0x7f050035
net.micode.notes:id/menu_list_mode = 0x7f050027
net.micode.notes:string/menu_lanyangyang = 0x7f0a002d
net.micode.notes:id/account_dialog_title = 0x7f050001
net.micode.notes:id/tv_folder_name = 0x7f05003f
net.micode.notes:id/menu_grass = 0x7f050025
net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0050
net.micode.notes:id/menu_font_size = 0x7f050024
net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004b
net.micode.notes:id/menu_alert = 0x7f050020
net.micode.notes:string/menu_grass = 0x7f0a002c
net.micode.notes:id/ll_font_small = 0x7f05001e
net.micode.notes:string/error_note_not_exist = 0x7f0a000e
net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
net.micode.notes:id/minute = 0x7f050030
net.micode.notes:id/ll_font_normal = 0x7f05001d
net.micode.notes:id/ll_font_large = 0x7f05001c
net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004c
net.micode.notes:string/menu_playground1 = 0x7f0a0032
net.micode.notes:id/iv_super_select = 0x7f05001b
net.micode.notes:string/ticker_success = 0x7f0a0065
net.micode.notes:id/iv_medium_select = 0x7f050019
net.micode.notes:id/iv_large_select = 0x7f050018
net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
net.micode.notes:id/iv_bg_yellow = 0x7f050016
net.micode.notes:layout/account_dialog_title = 0x7f060000
net.micode.notes:string/notelist_menu_new = 0x7f0a0045
net.micode.notes:drawable/menu_delete = 0x7f04002f
net.micode.notes:id/iv_bg_red_select = 0x7f050013
net.micode.notes:id/iv_bg_red = 0x7f050012
net.micode.notes:menu/note_edit = 0x7f070002
net.micode.notes:drawable/list_white_down = 0x7f040027
net.micode.notes:drawable/list_white_up = 0x7f04002a
net.micode.notes:id/iv_bg_green = 0x7f050010
net.micode.notes:drawable/delete = 0x7f040004
net.micode.notes:id/iv_bg_blue = 0x7f05000e
net.micode.notes:drawable/list_green_single = 0x7f040021
net.micode.notes:id/iv_alert_icon = 0x7f05000d
net.micode.notes:drawable/list_yellow_single = 0x7f04002d
net.micode.notes:id/cb_edit_item = 0x7f050006
net.micode.notes:drawable/font_super = 0x7f040014
net.micode.notes:drawable/edit_title_blue = 0x7f040009
net.micode.notes:color/user_query_highlight = 0x7f020002
net.micode.notes:id/font_size_selector = 0x7f05000b
net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0057
net.micode.notes:id/et_edit_text = 0x7f050009
net.micode.notes:drawable/widget_2x_yellow = 0x7f04003f
net.micode.notes:id/amPm = 0x7f050003
net.micode.notes:id/account_dialog_subtitle = 0x7f050000
net.micode.notes:drawable/clock = 0x7f040003
net.micode.notes:drawable/font_small = 0x7f040013
net.micode.notes:id/btn_set_bg_color = 0x7f050005
net.micode.notes:array/menu_share_ways = 0x7f010001
net.micode.notes:style/NoteTheme = 0x7f0b0003
net.micode.notes:drawable/notification = 0x7f040035
net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
net.micode.notes:string/menu_title_select_folder = 0x7f0a003d
net.micode.notes:string/hint_foler_name = 0x7f0a001d
net.micode.notes:drawable/list_red_down = 0x7f040023
net.micode.notes:id/menu_delete = 0x7f050021
net.micode.notes:drawable/lanyangyang = 0x7f040017
net.micode.notes:drawable/widget_4x_blue = 0x7f040040
net.micode.notes:drawable/edit_title_white = 0x7f04000c
net.micode.notes:string/menu_delete = 0x7f0a0021
net.micode.notes:drawable/list_footer_bg = 0x7f04001e
net.micode.notes:drawable/edit_red = 0x7f040008
net.micode.notes:string/preferences_menu_cancel = 0x7f0a0053
net.micode.notes:drawable/widget_2x_white = 0x7f04003e
net.micode.notes:drawable/widget_4x_yellow = 0x7f040044
net.micode.notes:drawable/grass = 0x7f040015
net.micode.notes:drawable/widget_2x_red = 0x7f04003d
net.micode.notes:drawable/font_large = 0x7f040010
net.micode.notes:string/file_path = 0x7f0a0016
net.micode.notes:string/menu_alert = 0x7f0a001f
net.micode.notes:drawable/title_alert = 0x7f040039
net.micode.notes:drawable/list_green_down = 0x7f04001f
net.micode.notes:string/error_sync_internal = 0x7f0a0012
net.micode.notes:drawable/search_result = 0x7f040037
net.micode.notes:string/app_widget4x4 = 0x7f0a0006
net.micode.notes:drawable/title_bar_bg = 0x7f04003a
net.micode.notes:drawable/selected = 0x7f040038
net.micode.notes:plurals/search_results_title = 0x7f080000
net.micode.notes:drawable/edit_title_green = 0x7f04000a
net.micode.notes:drawable/new_note_normal = 0x7f040032
net.micode.notes:drawable/edit_white = 0x7f04000e
net.micode.notes:drawable/widget_2x_green = 0x7f04003c
net.micode.notes:id/iv_bg_white = 0x7f050014
net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
net.micode.notes:drawable/list_yellow_up = 0x7f04002e
net.micode.notes:drawable/list_white_single = 0x7f040029
net.micode.notes:menu/note_list_dropdown = 0x7f070004
net.micode.notes:drawable/edit_title_red = 0x7f04000b
net.micode.notes:id/tv_title_bar = 0x7f050044
net.micode.notes:drawable/list_red_up = 0x7f040026
net.micode.notes:id/delete = 0x7f050008
net.micode.notes:layout/note_edit_list_item = 0x7f060006
net.micode.notes:string/call_record_folder_name = 0x7f0a0008
net.micode.notes:drawable/list_green_up = 0x7f040022
net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050039
net.micode.notes:id/et_foler_name = 0x7f05000a
net.micode.notes:id/menu_delete_remind = 0x7f050022
net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040034
net.micode.notes:id/menu_export_text = 0x7f050023
net.micode.notes:id/hour = 0x7f05000c
net.micode.notes:string/menu_folder_view = 0x7f0a0026
net.micode.notes:drawable/dropdown_icon = 0x7f040005
net.micode.notes:string/notelist_string_info = 0x7f0a0046
net.micode.notes:drawable/list_blue_single = 0x7f04001b
net.micode.notes:drawable/list_white_middle = 0x7f040028
net.micode.notes:drawable/call_record = 0x7f040002
net.micode.notes:id/text_num = 0x7f05003d
net.micode.notes:dimen/text_font_size_normal = 0x7f030002
net.micode.notes:layout/dialog_edit_text = 0x7f060003
net.micode.notes:color/secondary_text_dark = 0x7f020001
net.micode.notes:drawable/list_folder = 0x7f04001d
net.micode.notes:id/iv_bg_green_select = 0x7f050011
net.micode.notes:id/menu_new_note = 0x7f050029
net.micode.notes:drawable/list_green_middle = 0x7f040020
net.micode.notes:string/sync_progress_syncing = 0x7f0a0062
net.micode.notes:drawable/font_normal = 0x7f040011
net.micode.notes:drawable/list_blue_up = 0x7f04001c
net.micode.notes:id/iv_small_select = 0x7f05001a
net.micode.notes:drawable/list_blue_down = 0x7f040019
net.micode.notes:id/ll_font_super = 0x7f05001f
net.micode.notes:dimen/text_font_size_large = 0x7f030000
net.micode.notes:drawable/edit_yellow = 0x7f04000f
net.micode.notes:drawable/list_yellow_down = 0x7f04002b
net.micode.notes:dimen/text_font_size_super = 0x7f030004
net.micode.notes:drawable/edit_blue = 0x7f040006
net.micode.notes:array/format_for_exported_note = 0x7f010000
net.micode.notes:string/menu_list_mode = 0x7f0a002e
net.micode.notes:drawable/list_yellow_middle = 0x7f04002c
net.micode.notes:drawable/list_blue_middle = 0x7f04001a
net.micode.notes:dimen/text_font_size_medium = 0x7f030001
net.micode.notes:drawable/new_note_pressed = 0x7f040033
net.micode.notes:id/menu_new_folder = 0x7f050028
net.micode.notes:id/sv_note_edit = 0x7f05003c
net.micode.notes:drawable/edit_green = 0x7f040007
net.micode.notes:id/action_select_all = 0x7f050002
net.micode.notes:id/tv_modified_date = 0x7f050040
net.micode.notes:id/iv_bg_white_select = 0x7f050015
net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
net.micode.notes:layout/note_list_footer = 0x7f06000a
net.micode.notes:string/menu_font_super = 0x7f0a002b
net.micode.notes:drawable/widget_4x_red = 0x7f040042
net.micode.notes:layout/settings_header = 0x7f06000b
net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
net.micode.notes:dimen/text_font_size_small = 0x7f030003
net.micode.notes:layout/datetime_picker = 0x7f060002
net.micode.notes:menu/note_list_options = 0x7f070005
net.micode.notes:drawable/widget_4x_white = 0x7f040043
>>>>>>> 6e3c0ac64d4353056b0d608b98107da959497c89

@ -1047,5 +1047,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
return false;
}
<<<<<<< HEAD
=======
>>>>>>> 6e3c0ac64d4353056b0d608b98107da959497c89
}

Loading…
Cancel
Save