psoneyx8j
/
git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bdgit.educoder.net/psoneyx8j/git into 高长磊_branch

Browse Source 
# Conflicts:
#	src/Notes-master/Notes-master/.gradle/8.5/executionHistory/executionHistory.bin
#	src/Notes-master/Notes-master/.gradle/8.5/executionHistory/executionHistory.lock
#	src/Notes-master/Notes-master/.gradle/8.5/fileHashes/fileHashes.bin
#	src/Notes-master/Notes-master/.gradle/8.5/fileHashes/fileHashes.lock
#	src/Notes-master/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/Notes-master/Notes-master/.gradle/file-system.probe
#	src/Notes-master/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
#	src/Notes-master/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
#	src/Notes-master/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	src/Notes-master/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
#	src/Notes-master/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/Notes-master/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	src/Notes-master/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	src/Notes-master/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	src/Notes-master/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_0.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_1.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_10.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_11.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_12.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_14.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_15.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_2.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_3.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_4.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_5.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_6.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_7.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_8.jar
#	src/Notes-master/Notes-master/app/build/intermediates/project_dex_archive/debug/out/e5953daa12864cb18e7ffac76b4bce0758bfdf2921c02605a572cccb7e1d7373_9.jar
高长磊_branch
高长磊 5 months ago
parent e7bf23fbfd 7d28077af5
commit 92f3c6c3b4
227 changed files with 4926 additions and 4273 deletions
Show Stats Download Patch File Download Diff File

0
123.txt
Unescape View File

BIN
doc/小米便签泛读报告.docx
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/.gradle/8.5/checksums/checksums.lock
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

4
src/Notes-master/Notes-master/.gradle/config.properties
Unescape View File

@ -1,2 +1,2 @@
#Thu Nov 13 18:23:13 CST 2025
java.home=D\:\\Android studio2\\jbr
#Thu Nov 13 20:09:20 CST 2025
java.home=D\:\\software\\AndroidStudio\\jbr

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_12/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_13/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_14/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_15/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_0/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_1/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_10/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_11/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_12/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_13/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_14/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_15/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_2/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_3/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_4/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_5/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_6/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_7/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_8/graph.bin
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_3f7198cbe0815dd9b63d9f9ed6b0e6027e556a85d1c0e8a7ec37491a27355543_bucket_9/graph.bin
View File

Binary file not shown.

2
src/Notes-master/Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out
Unescape View File

@ -1 +1 @@
16
12

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+C1jMtdNw2_MzsiQn4H32n+XHP0=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0iqd8F1bg1RS4wTUCTN3qM2Om+4=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1ARgJQQPOMEuBtDogWNqxG+Xv7o=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2jbUwfnLlY0T4sVy2WctBia4wL8=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3zFkCNqyu0sO3Uh0OdicUgNaLww=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4pn0xoJHDyn7ZzEiMl21YXq7mHA=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/619ubFfQS+DIh2E4pCz84v3ar_g=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/64e0iC1JkmDfRnPjKO2aqsqw0Is=
View File

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7VuaDZHjaaSCplwDtVL6MGVwAmU=
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Fjln6vFQ4SGvSQ+UScp2bHBoKxQ=
View File

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JDAUG3CzY4dmBGwQk+DJWiS5eK0=
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L6haDaBwo5t5lfZF+SAcsOyO87k=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LGphkdZyW+stJ9joea18yQ1b3tI=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MIOb9XXAM4dbneojbrtI+tOuV+g=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/N3gufF5FeQ_XvgvPVD4x6sp_+Rg=
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QdBDzeBJmU+0I1+BE9BJfev_WTk=
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/TXp9KxWd1zmArXqHDWYL2Kq+BE8=
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YHZMcE0SL+kdFpNUOy4Kd1tcD4U=
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jORB9noGZew1LmRgE_+5Zgk5wMk=
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q+eHmxl0ayJ0fVZBKqC2YZqQux4=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qDivmlw_fEe885uoeZsuSOo+gN8=
View File

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/r0j+Wx9vcdPRkZvBVLR6JOfQzdo=
View File

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rNA1gZUZwWpc+CZgqnu+iUkPKV8=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rVNaPonZC5W7UtR+IGzkKlxd8e8=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rqwEeH77zdtuVRtM+CTpxM+rnzs=
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wdp5N5TsuKxSsDCoQP1xaZ+09K8=
View File

Binary file not shown.

BIN
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/x+vJ3gaW3EH1rEgl2m2Y7u9AOFw=
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

99
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
Unescape View File

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

242
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

99
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
Unescape View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
#Fri Nov 14 08:00:54 CST 2025
net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
@ -94,3 +95,101 @@ net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\git-test\\git\\src\\Notes
net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\git-test\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
=======
#Thu Nov 13 20:21:36 CST 2025
net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
net.micode.notes.app-main-5\:/raw/introduction=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\software\\program\\git\\src\\Notes-master\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
>>>>>>> 7d28077af5fd290d16095eeaa11cdbcc4112c309

16
src/Notes-master/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

2
src/Notes-master/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
Unescape View File

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

2
src/Notes-master/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
Unescape View File

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

2
src/Notes-master/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
Unescape View File

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

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

Write Preview
Loading…
Cancel
Save