remotes/checkIfPRContentChanged-1683789003578357705/develop
parent
a2012634b4
commit
1c11f5ead3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -1,4 +1,25 @@
|
||||
#Fri Apr 21 15:37:17 ULAT 2023
|
||||
base.0=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
renamed.0=classes.dex
|
||||
#Wed May 03 16:38:27 ULAT 2023
|
||||
path.4=13/classes.dex
|
||||
path.3=12/classes.dex
|
||||
path.2=11/classes.dex
|
||||
path.1=0/classes.dex
|
||||
path.7=5/classes.dex
|
||||
path.6=4/classes.dex
|
||||
path.5=15/classes.dex
|
||||
path.0=classes.dex
|
||||
base.4=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex
|
||||
base.3=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex
|
||||
base.2=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
|
||||
base.1=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
|
||||
base.0=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
|
||||
renamed.3=classes4.dex
|
||||
renamed.2=classes3.dex
|
||||
renamed.1=classes2.dex
|
||||
renamed.0=classes.dex
|
||||
renamed.7=classes8.dex
|
||||
renamed.6=classes7.dex
|
||||
base.7=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex
|
||||
renamed.5=classes6.dex
|
||||
base.6=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
|
||||
renamed.4=classes5.dex
|
||||
base.5=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,382 +1,502 @@
|
||||
[
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/sub_folder.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/note_item.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/sub_folder.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/settings_header.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable/new_note.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat",
|
||||
"source": "net.micode.notes.app-main-7:/raw/introduction"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/widget_2x.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png"
|
||||
"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-5:/drawable-hdpi_list_white_up.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable/new_note.xml"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/xml/preferences.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/widget_2x.xml"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png"
|
||||
},
|
||||
{
|
||||
"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": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/xml/preferences.xml"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat",
|
||||
"source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/widget_4x.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/note_list.xml"
|
||||
},
|
||||
{
|
||||
"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": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png"
|
||||
},
|
||||
{
|
||||
"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": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/note_list.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/widget_4x.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/xml/searchable.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_imageeee.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\imageeee.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/add_account_text.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/note_list.xml"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/note_edit.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/note_list.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/add_account_text.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/note_item.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/note_list_options.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/settings_header.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat",
|
||||
"source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png"
|
||||
"merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/xml/searchable.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/note_list_options.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml"
|
||||
},
|
||||
{
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/menu/note_edit.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat",
|
||||
"source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png"
|
||||
},
|
||||
{
|
||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat",
|
||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png"
|
||||
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat",
|
||||
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png"
|
||||
}
|
||||
]
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue