Merge branch 'develop' of https://bdgit.educoder.net/ml5sa8pux/gitProject1 into develop
# Conflicts: # src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin # src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock # src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin # src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock # src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/Notes-master1/.gradle/file-system.probe # src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk # src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt # src/Notes-master1/caches/7.5/executionHistory/executionHistory.bin # src/Notes-master1/caches/7.5/executionHistory/executionHistory.lock # src/Notes-master1/caches/7.5/fileHashes/fileHashes.bin # src/Notes-master1/caches/7.5/fileHashes/fileHashes.lock # src/Notes-master1/caches/journal-1/file-access.bin # src/Notes-master1/caches/journal-1/journal-1.lock # src/Notes-master1/caches/modules-2/modules-2.lock # src/Notes-master1/daemon/7.5/registry.bin # src/Notes-master1/daemon/7.5/registry.bin.lock # src/Notes-master1/gradle.propertiesremotes/checkIfPRContentChanged-1686071232377778367/develop
commit
302d3bf269
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
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,390 +1,406 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png"
|
"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",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml"
|
"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",
|
"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": "net.micode.notes.app-main-7:/layout/folder_list_item.xml"
|
"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_selected.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_login.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\login.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png"
|
"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:/menu_sub_folder.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/menu/sub_folder.xml"
|
"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_list_footer_bg.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png"
|
"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_clock.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png"
|
"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:/raw_introduction.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/raw/introduction"
|
"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_widget_4x_yellow.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png"
|
"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:/drawable-hdpi_list_white_up.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png"
|
"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:/drawable-hdpi_widget_4x_blue.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png"
|
"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_widget_2x_green.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png"
|
"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:/drawable_new_note.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable/new_note.xml"
|
"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:/layout_widget_2x.xml.flat",
|
"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": "net.micode.notes.app-main-7:/layout/widget_2x.xml"
|
"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:/xml_widget_2x_info.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml"
|
"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:/menu_call_record_folder.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml"
|
"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:/xml_preferences.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/xml/preferences.xml"
|
"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:/layout_dialog_edit_text.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml"
|
"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_imageeee.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/imageeee.png"
|
"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_edit_title_blue.9.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png"
|
"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_list_yellow_single.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png"
|
"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:/color_secondary_text_dark.xml.flat",
|
"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": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml"
|
"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:/xml_widget_4x_info.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml"
|
"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-hdpi_list_blue_up.9.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png"
|
"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:/drawable-hdpi_list_white_middle.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png"
|
"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:/drawable-hdpi_list_white_single.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png"
|
"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_edit_yellow.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png"
|
"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:/layout_note_edit.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
|
"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:/layout_widget_4x.xml.flat",
|
"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": "net.micode.notes.app-main-7:/layout/widget_4x.xml"
|
"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_green.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png"
|
"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:/drawable-hdpi_menu_delete.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png"
|
"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:/layout_note_list.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/layout/note_list.xml"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\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_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": "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_green_down.9.png.flat",
|
"merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png"
|
"source": "net.micode.notes.app-main-7:/layout/note_list.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png"
|
"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_dropdown_icon.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png"
|
"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_bg_btn_set_color.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png"
|
"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:/menu_note_list.xml.flat",
|
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/menu/note_list.xml"
|
"source": "net.micode.notes.app-main-7:/menu/note_list.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat",
|
"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": "net.micode.notes.app-main-7:/layout/note_list_footer.xml"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\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_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": "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:/layout_login.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/layout/login.xml"
|
"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:/drawable-hdpi_menu_move.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_imageeee.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png"
|
"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_bg_color_btn_mask.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png"
|
"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:/layout_add_account_text.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/layout/add_account_text.xml"
|
"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:/layout_datetime_picker.xml.flat",
|
"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": "net.micode.notes.app-main-7:/layout/datetime_picker.xml"
|
"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_font_super.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png"
|
"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_list_blue_single.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png"
|
"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_widget_2x_yellow.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png"
|
"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:/drawable-hdpi_delete.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png"
|
"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:/drawable-hdpi_edit_green.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png"
|
"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:/menu_note_edit.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/menu/note_edit.xml"
|
"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_account_dialog_title.xml.flat",
|
"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": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml"
|
"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_call_record.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png"
|
"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_green_up.9.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png"
|
"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:/drawable-hdpi_list_folder.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png"
|
"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_list_red_single.9.png.flat",
|
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_background0.jpg.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png"
|
"source": "net.micode.notes.app-main-7:/drawable-hdpi/background0.jpg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png"
|
"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:/drawable-hdpi_list_red_down.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png"
|
"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_new_note_pressed.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\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_pressed.png"
|
"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_white.9.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png"
|
"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:/layout_note_item.xml.flat",
|
"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": "net.micode.notes.app-main-7:/layout/note_item.xml"
|
"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:/layout_settings_header.xml.flat",
|
"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": "net.micode.notes.app-main-7:/layout/settings_header.xml"
|
"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:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png"
|
"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:/drawable-hdpi_widget_4x_red.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png"
|
"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:/drawable-hdpi_list_yellow_up.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\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_white.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat",
|
"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": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png"
|
"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_search_result.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png"
|
"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_4x_green.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/xml/searchable.xml"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png"
|
"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:/drawable-hdpi_list_yellow_middle.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml"
|
"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_new_note_normal.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png"
|
"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:/layout_note_edit_list_item.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat",
|
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_background1.jpg.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png"
|
"source": "net.micode.notes.app-main-7:/drawable-hdpi/background1.jpg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png"
|
"source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat",
|
"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": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png"
|
"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:/drawable-hdpi_edit_blue.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png"
|
"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:/menu_note_list_options.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/menu/note_list_options.xml"
|
"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:/menu_call_note_edit.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml"
|
"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:/drawable-hdpi_list_green_single.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png"
|
"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_widget_2x_red.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png"
|
"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:/color_primary_text_dark.xml.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml"
|
"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_list_white_down.9.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png"
|
"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_font_small.png.flat",
|
"merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat",
|
||||||
"source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png"
|
"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.
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