p40265318
/
pi64wfgrq
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: p40265318:develop
Branches Tags
p40265318:master
p40265318:develop
...
pull from: p40265318:master
Branches Tags
p40265318:master
p40265318:develop

11 Commits
develop ... master

Author SHA1 Message Date
rjh 889a139a07 修改考评表
5 years ago
rjh 6bdaf58466 提交修改版本
5 years ago
rjh eedb30e64b 提交报告
5 years ago
rjh 4d8a8b02f8 Merge branch 'master' of http://bdgit.educoder.net/p40265318/pi64wfgrq into master
5 years ago
rjh bef6eda7da 提交
5 years ago
rjh 7043b5322d 提交
5 years ago
rjh 5579f75dc2 重新提交
5 years ago
rjh 93c766e5c7 提交代码
5 years ago
rjh 241c5a7252 提交PPT
5 years ago
rjh c8aa0e854d 提交报告
5 years ago
rjh 99cbe6c843 提交设计方案
5 years ago
348 changed files with 1882 additions and 1 deletions
Show Stats

BIN
doc/小米便签开源代码的泛读报告.docx
View File

Binary file not shown.

BIN
doc/小米维护报告.pptx
View File

Binary file not shown.

BIN
doc/开源软件维护设计方案模板.docx
View File

Binary file not shown.

BIN
doc/模板-阅读和维护开源软件的考评表.xlsx
View File

Binary file not shown.

BIN
doc/质量分析报告.docx
View File

Binary file not shown.

0
model/test.txt
Unescape View File

BIN
src/Notes-master.zip
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/6.1.1/executionHistory/executionHistory.bin
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/6.1.1/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/6.1.1/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/6.1.1/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/6.1.1/fileHashes/resourceHashesCache.bin
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/6.1.1/javaCompile/classAnalysis.bin
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/6.1.1/javaCompile/jarAnalysis.bin
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/6.1.1/javaCompile/javaCompile.lock
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/6.1.1/javaCompile/taskHistory.bin
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/buildOutputCleanup/outputFiles.bin
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/checksums/checksums.lock
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/checksums/md5-checksums.bin
View File

Binary file not shown.

BIN
src/Notes-master2/.gradle/checksums/sha1-checksums.bin
View File

Binary file not shown.

BIN
src/Notes-master2/.idea/caches/build_file_checksums.ser
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/app_classes/debug/classes.jar
View File

Binary file not shown.

249
src/Notes-master2/app/build/intermediates/blame/res/debug/single/debug.json
Unescape View File

@ -1,9 +1,12 @@
[
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
},
@ -16,10 +19,13 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list.xml"
},
@ -28,14 +34,19 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit.xml"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_edit.xml"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
},
@ -44,10 +55,13 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable\\new_note.xml"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\searchable.xml"
},
@ -64,22 +78,29 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_4x.xml"
},
@ -92,6 +113,8 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
},
@ -100,6 +123,7 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
},
@ -108,18 +132,24 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\sub_folder.xml"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\add_account_text.xml"
},
@ -128,10 +158,13 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_item.xml"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
},
@ -152,10 +185,13 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\datetime_picker.xml"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
},
@ -164,6 +200,8 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
},
@ -176,6 +214,7 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
},
@ -192,6 +231,13 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
},
{
<<<<<<< HEAD
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_secret_folder.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dialog_secret_folder.xml"
},
{
=======
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
},
@ -200,6 +246,161 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png"
},
{
<<<<<<< HEAD
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\settings_header.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_play_record.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\play_record.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_2x.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable\\new_note.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\searchable.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_note_edit.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list_options.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\sub_folder.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
},
{
=======
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
},
@ -212,24 +413,34 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
},
{
<<<<<<< HEAD
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
},
{
<<<<<<< HEAD
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat",
@ -244,30 +455,45 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
},
{
<<<<<<< HEAD
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_record_activity.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\record_activity.xml"
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\settings_header.xml"
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
},
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
},
@ -276,18 +502,24 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\raw\\introduction"
},
@ -296,10 +528,13 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_2x.xml"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_record_folder.xml"
},
@ -312,6 +547,8 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
},
@ -320,10 +557,13 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
},
@ -332,6 +572,7 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
},
@ -348,10 +589,13 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
},
{
<<<<<<< HEAD
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
},
{
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
},
@ -360,6 +604,10 @@
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
},
{
<<<<<<< HEAD
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png"
=======
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
},
@ -378,5 +626,6 @@
{
"merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat",
"source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml"
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
}
]

32
src/Notes-master2/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml
Unescape View File

@ -4,9 +4,13 @@
android:versionCode="1"
android:versionName="0.1" >
<<<<<<< HEAD
<uses-sdk android:minSdkVersion="14" />
=======
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="22" />
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- -write on SD card -->
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> <!-- -快捷方式 -->
@ -17,11 +21,21 @@
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <!-- -获取账户 -->
<uses-permission android:name="android.permission.USE_CREDENTIALS" /> <!-- -使用证书 -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<<<<<<< HEAD
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
=======
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
<application
android:debuggable="true"
android:icon="@drawable/icon_app"
<<<<<<< HEAD
android:label="@string/app_name"
android:testOnly="true" >
=======
android:label="@string/app_name" >
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
<activity
android:name="net.micode.notes.ui.NotesListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
@ -61,6 +75,12 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<<<<<<< HEAD
<intent-filter>
<action android:name="android.intent.action.INSERT" />
</intent-filter>
=======
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
<meta-data
android:name="android.app.searchable"
@ -129,6 +149,18 @@
<meta-data
android:name="android.app.default_searchable"
android:value=".ui.NoteEditActivity" />
<<<<<<< HEAD
<activity
android:name="net.micode.notes.ui.RecordActivity"
android:label="Notes"
android:launchMode="standard" />
<activity
android:name="net.micode.notes.tool.PlayRecord"
android:label="Notes"
android:launchMode="standard" />
=======
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
</application>
</manifest>

BIN
src/Notes-master2/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6hUxxVup1AW_pTwH23dEkvqKzW0=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KUOcYH1EU8kpX0coULV8m3nX_xk=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RinWMjcgzQK01hf42URXV4wo234=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UKJtP_l1P41frPn0Si3UkIlNHNc=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/V1DKrsX9COFbw+DWKdTAzYgtpQo=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cSW2ukhd2j44I+VeN5VqJf+p5_Y=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jadWs7I4BtoyGWd1v4yz5RITHOo=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xHAHFLSQKWsctiAyV4IvVu5Z6f4=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xutOoYG3kYVYXxFwGLSP9dz5LFs=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/y27R6N73TuhBAUu8Jr0fww5Ab6E=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/+AI+_LVXnsJyA187liJlk4DGA0Q=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/0fzeYWDf1rpMQC0zC430Yh2dZ44=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/2njZiM4tviaRCY43d+dgYKRURGc=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/5MWH+IRXEyKXtLal8osJuvbwcMA=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/5j4KH2YF8n9EIfTJX0rYngdQOBo=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/6P3ESlRmD8pVF4Uz7NiFNQmQhnA=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/6hUxxVup1AW_pTwH23dEkvqKzW0=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/9qFgPSxPz9EasEoyaEQV6vXQS9s=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Cp1IHCd0CB4KKEUC6Hwhvoi7uZs=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/KUOcYH1EU8kpX0coULV8m3nX_xk=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/M_dQrYNm_9npQoWH3+p5jr9brec=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Opf2iLJvgCDuqGAdLMWrryCYR9Y=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Q4nPp0WFM5sy_NfHmAk8Ladg8bY=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/QbMoHk_HAz68L6Nsi9ALQaaSN_8=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/RinWMjcgzQK01hf42URXV4wo234=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SNSx5SQsXDqi4L78s1w0pqYi_4U=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SdOawxP4uMe3ZkPNLpgr7X0wEJI=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/U2GVmRFScqY9MvaG_sFMSdu_LFU=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/UKJtP_l1P41frPn0Si3UkIlNHNc=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/UoR4eDgfI2_G8EZzK7ICV4FR8go=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/V1DKrsX9COFbw+DWKdTAzYgtpQo=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/WGvzWehVMsL3u5lrX_DHyzeZeyI=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/YUhcdkfo0nzEcf9utNPfYcqjSbM=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/cSW2ukhd2j44I+VeN5VqJf+p5_Y=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/fjODaeRjd4XhReezmT3pajn9Ie0=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/jGNbJSdA20mrPNuEXxG_6YrVITo=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/jadWs7I4BtoyGWd1v4yz5RITHOo=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/kHW8pi5wHXqtKcpHWnwIOQCRvaA=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/lRmmS6368VdmBY5WgZuieYldq+I=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/nQaVzXsL9NbZjw7H6yQs_x6AlY4=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/nq7ZF20Utz0xM7XcqelDhNHCalY=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/r+q3hZclL9mjTQjgPXe2YK6FJeA=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/srV2HTqnuaHZl4bvinv0BK9ro7E=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/suHpNcStxswHBtJMFQWuvm3d9V8=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/u8lDEuBEpTIrk8xBhkw1N932KXM=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/xHAHFLSQKWsctiAyV4IvVu5Z6f4=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/xutOoYG3kYVYXxFwGLSP9dz5LFs=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/y27R6N73TuhBAUu8Jr0fww5Ab6E=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/zNLGzHNM0Cq7Ru61spPqlQ77zkg=
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/zkhwsT91in5Lh_zWfPI7LBrKRpY=
View File

Binary file not shown.

102
src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
Unescape View File

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

10
src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

4
src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
Unescape View File

@ -1,4 +1,8 @@
<<<<<<< HEAD
#Fri Nov 27 08:46:26 CST 2020
=======
#Fri Oct 16 08:44:26 CST 2020
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
base.0=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
path.0=classes.dex
renamed.0=classes.dex

BIN
src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
View File

Binary file not shown.

32
src/Notes-master2/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
Unescape View File

@ -5,9 +5,13 @@
android:versionCode="1"
android:versionName="0.1" >
<<<<<<< HEAD
<uses-sdk android:minSdkVersion="14" />
=======
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="22" />
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- -write on SD card -->
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> <!-- -快捷方式 -->
@ -18,11 +22,21 @@
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <!-- -获取账户 -->
<uses-permission android:name="android.permission.USE_CREDENTIALS" /> <!-- -使用证书 -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<<<<<<< HEAD
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
=======
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
<application
android:debuggable="true"
android:icon="@drawable/icon_app"
<<<<<<< HEAD
android:label="@string/app_name"
android:testOnly="true" >
=======
android:label="@string/app_name" >
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
<activity
android:name="net.micode.notes.ui.NotesListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
@ -62,6 +76,12 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<<<<<<< HEAD
<intent-filter>
<action android:name="android.intent.action.INSERT" />
</intent-filter>
=======
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
<meta-data
android:name="android.app.searchable"
@ -130,6 +150,18 @@
<meta-data
android:name="android.app.default_searchable"
android:value=".ui.NoteEditActivity" />
<<<<<<< HEAD
<activity
android:name="net.micode.notes.ui.RecordActivity"
android:label="Notes"
android:launchMode="standard" />
<activity
android:name="net.micode.notes.tool.PlayRecord"
android:label="Notes"
android:launchMode="standard" />
=======
>>>>>>> 759f169b2a7660bdb7357591afc4b4679d42d0cc
</application>
</manifest>

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
View File

Binary file not shown.

BIN
src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save