Merge branch 'develop' of https://bdgit.educoder.net/pfinzu3bk/xiaomi_Note into tongsicheng_branch

# Conflicts:
#	src/Notes-master/.gradle/7.3.3/checksums/checksums.lock
#	src/Notes-master/.gradle/7.3.3/checksums/sha1-checksums.bin
#	src/Notes-master/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock
#	src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin
#	src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock
#	src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin
#	src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock
#	src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin
#	src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/Notes-master/.gradle/file-system.probe
#	src/Notes-master/.idea/workspace.xml
#	src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
#	src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
#	src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
#	src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
#	src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
#	src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
#	src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin
#	src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
#	src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
#	src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
#	src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat
#	src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
#	src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
#	src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
#	src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
#	src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
tongsicheng_branch
Curitis2002 3 years ago
commit e7f0c08253

3
.idea/.gitignore vendored

@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

@ -2,7 +2,11 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<<<<<<< HEAD
<module fileurl="file://$PROJECT_DIR$/xiaomi_Note.iml" filepath="$PROJECT_DIR$/xiaomi_Note.iml" />
=======
<module fileurl="file://$PROJECT_DIR$/.idea/xiaomi_Note.iml" filepath="$PROJECT_DIR$/.idea/xiaomi_Note.iml" />
>>>>>>> e29be7529771528cdc0b8c2e431e41e58f52ca18
</modules>
</component>
</project>

@ -23,6 +23,8 @@
<entry key="..\:/project2/xiaomi_Note/src/Notes-master/app/src/main/res/menu/sub_folder.xml" value="0.1875" />
<entry key="..\:/project2/xiaomi_Note/src/Notes-master/app/src/main/res/xml/activity_login.xml" value="0.18645833333333334" />
<entry key="..\:/project2/xiaomi_Note/src/Notes-master/app/src/main/res/xml/preferences.xml" value="0.1875" />
<entry key="..\:/xiaomi/xiaomi_Note/src/Notes-master/app/src/main/res/menu/note_edit.xml" value="0.21388888888888888" />
<entry key="..\:/xiaomi/xiaomi_Note/src/Notes-master/app/src/main/res/menu/note_list.xml" value="0.1" />
<entry key="..\:/xiaomi_Note/src/Notes-master/app/src/main/res/menu/note_edit.xml" value="0.1" />
</map>
</option>

@ -24,6 +24,7 @@
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out">
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
</content>
<content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/out" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug">

@ -18,4 +18,16 @@ X
7
gradlew,5\b\5bbfa66edb4db3c7c33c5181f43510990d3307f9
;
gradlew.bat,2\a\2a45a911a8f1836b0b6c5b758962572012d8f8c3
gradlew.bat,2\a\2a45a911a8f1836b0b6c5b758962572012d8f8c3
<
build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
@
app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
?
settings.gradle,0\5\05efc8b1657769a27696d478ded1e95f38737233
b
2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5
p
@app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java,4\5\4529b3a97b0f3b19b895aa06f23bed63ff38a312
s
Capp/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java,0\2\023468cfdd0b71d4098903b9070e364658e2fbcf

@ -14,6 +14,7 @@
<component name="ChangeListManager">
<list default="true" id="e0079f3a-80a2-4216-a0ff-1482a6e40a07" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<<<<<<< HEAD
<change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/0/2/023468cfdd0b71d4098903b9070e364658e2fbcf" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/index.pb" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/index.pb" afterDir="false" />
@ -22,13 +23,143 @@
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex" afterDir="false" />
=======
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/Notes-master.app.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/Notes-master.app.main.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugShaders/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugShaders/merger.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword$1.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/menu/note_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/note_list.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\16592\.android\avd\Pixel_2_API_28.avd]" />
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\Physicx\.android\avd\Pixel_2_API_22.avd]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
@ -88,7 +219,7 @@
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.17" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="configurable.group.editor" />
<property name="settings.editor.selected.configurable" value="Errors" />
<property name="show.inlinked.gradle.project.popup" value="false" />
</component>
<component name="RecentsManager">

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

@ -0,0 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="menu_share_ways">
<item>短信</item>
<item>邮件</item>
</string-array>
<plurals name="search_results_title">
<item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
</plurals>
<string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗?</string>
<string name="alert_message_delete_note">确认要删除该条便签吗?</string>
<string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
<string name="alert_title_delete">删除</string>
<string name="app_name">便签</string>
<string name="app_widget2x2">便签2x2</string>
<string name="app_widget4x4">便签4x4</string>
<string name="button_delete">删除</string>
<string name="call_record_folder_name">通话便签</string>
<string name="datetime_dialog_cancel">取消</string>
<string name="datetime_dialog_ok">设置</string>
<string name="delete_remind_time_message">成功删除提醒</string>
<string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
<string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
<string name="error_note_not_exist">要查看的便签不存在</string>
<string name="error_sdcard_export">导出文本时发生错误请检查SD卡</string>
<string name="error_sdcard_unmounted">SD卡被占用不能操作</string>
<string name="error_sync_cancelled">同步已取消</string>
<string name="error_sync_internal">同步失败,发生内部错误</string>
<string name="error_sync_network">同步失败,请检查网络和帐号设置</string>
<string name="failed_sdcard_export">导出失败</string>
<string name="folder_exist">文件夹 %1$s 已存在,请重新命名</string>
<string name="format_date_ymd">yyyyMMdd</string>
<string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
<string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
<string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
<string name="hint_foler_name">请输入名称</string>
<string name="info_note_enter_desktop">已添加到桌面</string>
<string name="menu_alert">提醒我</string>
<string name="menu_countallNotes">便签数量 </string>
<string name="menu_create_folder">新建文件夹</string>
<string name="menu_delete">删除</string>
<string name="menu_deselect_all">取消全选</string>
<string name="menu_export_text">导出文本</string>
<string name="menu_folder_change_name">修改文件夹名称</string>
<string name="menu_folder_delete">刪除文件夹</string>
<string name="menu_folder_view">查看文件夹</string>
<string name="menu_font_large"></string>
<string name="menu_font_normal">正常</string>
<string name="menu_font_size">文字大小</string>
<string name="menu_font_small"></string>
<string name="menu_font_style">选择字体</string>
<string name="menu_font_super">超大</string>
<string name="menu_list_mode">进入清单模式</string>
<string name="menu_move">移动到文件夹</string>
<string name="menu_move_parent_folder">上一级文件夹</string>
<string name="menu_normal_mode">退出清单模式</string>
<string name="menu_remove_remind">删除提醒</string>
<string name="menu_search">搜索</string>
<string name="menu_select_all">全选</string>
<string name="menu_select_none">没有选中项,操作无效</string>
<string name="menu_select_title">选中了 %d 项</string>
<string name="menu_send_to_desktop">发送到桌面</string>
<string name="menu_setting">设置</string>
<string name="menu_share">分享</string>
<string name="menu_sync">同步</string>
<string name="menu_sync_cancel">取消同步</string>
<string name="menu_title_select_folder">选择文件夹</string>
<string name="note_alert_expired">已过期</string>
<string name="note_link_email">发送邮件</string>
<string name="note_link_other">打开地图</string>
<string name="note_link_tel">呼叫电话</string>
<string name="note_link_web">浏览网页</string>
<string name="notealert_enter">查看</string>
<string name="notealert_ok">知道了</string>
<string name="notelist_menu_new">新建便签</string>
<string name="notelist_string_info">...</string>
<string name="preferences_account_summary">与google task同步便签记录</string>
<string name="preferences_account_title">同步账号</string>
<string name="preferences_add_account">添加账号</string>
<string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
<string name="preferences_button_sync_cancel">取消同步</string>
<string name="preferences_button_sync_immediately">立即同步</string>
<string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
<string name="preferences_dialog_change_account_warn_msg">如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复</string>
<string name="preferences_dialog_select_account_tips">请选择google帐号便签将与该帐号的google task内容同步。</string>
<string name="preferences_dialog_select_account_title">同步便签</string>
<string name="preferences_last_sync_time">上次同步于 %1$s</string>
<string name="preferences_menu_cancel">取消</string>
<string name="preferences_menu_change_account">更换账号</string>
<string name="preferences_menu_remove_account">删除账号</string>
<string name="preferences_title">设置</string>
<string name="preferences_toast_cannot_change_account">正在同步中,不能修改同步帐号</string>
<string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
<string name="search">便签</string>
<string name="search_hint">搜索便签</string>
<string name="search_label">正在搜索便签</string>
<string name="search_setting_description">便签中的文字</string>
<string name="set_remind_time_message">创建提醒</string>
<string name="success_sdcard_export">导出成功</string>
<string name="success_sync_account">与%1$s同步成功</string>
<string name="sync_progress_init_list">正在获取服务器便签列表...</string>
<string name="sync_progress_login">登录%1$s...</string>
<string name="sync_progress_syncing">正在同步本地便签...</string>
<string name="ticker_cancel">同步已取消</string>
<string name="ticker_fail">同步失败</string>
<string name="ticker_success">同步成功</string>
<string name="ticker_syncing">同步便签...</string>
<string name="widget_havenot_content">没有关联内容,点击新建便签。</string>
<string name="widget_under_visit_mode">访客模式下,便签内容不可见</string>
</resources>

@ -0,0 +1,173 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="format_for_exported_note">
<item>-%s</item>
<item>--%s</item>
<item>--%s</item>
<item>--%s</item>
</string-array>
<string-array name="menu_share_ways">
<item>Messaging</item>
<item>Email</item>
</string-array>
<color name="user_query_highlight">#335b5b5b</color>
<dimen name="text_font_size_large">26sp</dimen>
<dimen name="text_font_size_medium">20sp</dimen>
<dimen name="text_font_size_normal">17sp</dimen>
<dimen name="text_font_size_small">14sp</dimen>
<dimen name="text_font_size_super">33sp</dimen>
<plurals name="search_results_title">
<item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
<item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
</plurals>
<string name="LoginSetting">LoginSetting</string>
<string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
<string name="alert_message_delete_note">Confirm to delete this note?</string>
<string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
<string name="alert_title_delete">Delete selected notes</string>
<string name="app_name">Notes</string>
<string name="app_widget2x2">Notes 2x2</string>
<string name="app_widget4x4">Notes 4x4</string>
<string name="button_delete">Delete</string>
<string name="call_record_folder_name">Call notes</string>
<string name="datetime_dialog_cancel">cancel</string>
<string name="datetime_dialog_ok">set</string>
<string name="delete_password">delete password</string>
<string name="delete_remind_time_message">Delete reminder successfully</string>
<string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
<string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
<string name="error_note_not_exist">The note is not exist</string>
<string name="error_sdcard_export">Export failed, please check SD card</string>
<string name="error_sdcard_unmounted">SD card busy, not available now</string>
<string name="error_sync_cancelled">Sync is canceled</string>
<string name="error_sync_internal">Sync failed, internal error occurs</string>
<string name="error_sync_network">Sync failed, please check network and account settings</string>
<string name="failed_sdcard_export">Export fail</string>
<string name="file_name_txt_format">notes_%s.txt</string>
<string name="file_path">/MIUI/notes/</string>
<string name="folder_exist">The folder %1$s exist, please rename</string>
<string name="format_date_ymd">yyyyMMdd</string>
<string name="format_datetime_mdhm">MMMd kk:mm</string>
<string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
<string name="format_folder_files_count">(%d)</string>
<string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
<string name="hint_foler_name">Input name</string>
<string name="info_note_enter_desktop">Note added to home</string>
<string name="menu_alert">Remind me</string>
<string name="menu_countallNotes" translatable="false">countallNotes" </string>
<string name="menu_create_folder">New Folder</string>
<string name="menu_delete">Delete</string>
<string name="menu_deselect_all">Deselect all</string>
<string name="menu_export_text">Export text</string>
<string name="menu_folder_change_name">Change folder name</string>
<string name="menu_folder_delete">Delete folder</string>
<string name="menu_folder_view">View folder</string>
<string name="menu_font_large">Large</string>
<string name="menu_font_normal">Medium</string>
<string name="menu_font_size">Font size</string>
<string name="menu_font_small">Small</string>
<string name="menu_font_style">Select font</string>
<string name="menu_font_super">Super</string>
<string name="menu_list_mode">Enter check list</string>
<string name="menu_move">Move to folder</string>
<string name="menu_move_parent_folder">Parent folder</string>
<string name="menu_normal_mode">Leave check list</string>
<string name="menu_remove_remind">Delete reminder</string>
<string name="menu_search">Search</string>
<string name="menu_select_all">Select all</string>
<string name="menu_select_none">Nothing selected, the operation is invalid</string>
<string name="menu_select_title">%d selected</string>
<string name="menu_send_to_desktop">Send to home</string>
<string name="menu_setting">Settings</string>
<string name="menu_share">Share</string>
<string name="menu_sync">Sync</string>
<string name="menu_sync_cancel">Cancel syncing</string>
<string name="menu_title_select_folder">Select folder</string>
<string name="note_alert_expired">Expired</string>
<string name="note_link_email">Send email</string>
<string name="note_link_other">Open map</string>
<string name="note_link_tel">Call</string>
<string name="note_link_web">Browse web</string>
<string name="notealert_enter">Take a look</string>
<string name="notealert_ok">Got it</string>
<string name="notelist_menu_new">Add note</string>
<string name="notelist_string_info">...</string>
<string name="preferences_account_summary">Sync notes with google task</string>
<string name="preferences_account_title">Sync account</string>
<string name="preferences_add_account">Add account</string>
<string name="preferences_bg_random_appear_title">New note background color random</string>
<string name="preferences_button_sync_cancel">Cancel syncing</string>
<string name="preferences_button_sync_immediately">Sync immediately</string>
<string name="preferences_dialog_change_account_title">Current account %1$s</string>
<string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
<string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
<string name="preferences_dialog_select_account_title">Sync notes</string>
<string name="preferences_last_sync_time">Last sync time %1$s</string>
<string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
<string name="preferences_menu_cancel">Cancel</string>
<string name="preferences_menu_change_account">Change sync account</string>
<string name="preferences_menu_remove_account">Remove sync account</string>
<string name="preferences_title">Settings</string>
<string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
<string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
<string name="search">Notes</string>
<string name="search_hint">Search notes</string>
<string name="search_label">Searching Notes</string>
<string name="search_setting_description">Text in your notes</string>
<string name="set_remind_time_message">Set reminder</string>
<string name="success_sdcard_export">Export successful</string>
<string name="success_sync_account">Sync is successful with account %1$s</string>
<string name="sync_progress_init_list">Getting remote note list...</string>
<string name="sync_progress_login">Logging into %1$s...</string>
<string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
<string name="ticker_cancel">Sync is canceled</string>
<string name="ticker_fail">Sync is failed</string>
<string name="ticker_success">Sync is successful</string>
<string name="ticker_syncing">Syncing notes...</string>
<string name="widget_havenot_content">No associated note found, click to create associated note.</string>
<string name="widget_under_visit_mode">Privacy modecan not see note content</string>
<style name="HighlightTextAppearancePrimary">
<item name="android:textSize">@dimen/text_font_size_normal</item>
<item name="android:textColor">@color/primary_text_dark</item>
</style>
<style name="HighlightTextAppearanceSecondary">
<item name="android:textSize">@dimen/text_font_size_small</item>
<item name="android:textColor">@color/secondary_text_dark</item>
</style>
<style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
<item name="android:visibility">visible</item>
</style>
<style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
<item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
</style>
<style name="TextAppearanceLarge">
<item name="android:textSize">@dimen/text_font_size_large</item>
<item name="android:textColorLink">#0000ff</item>
</style>
<style name="TextAppearanceMedium">
<item name="android:textSize">@dimen/text_font_size_medium</item>
<item name="android:textColorLink">#0000ff</item>
</style>
<style name="TextAppearanceNormal">
<item name="android:textSize">@dimen/text_font_size_normal</item>
<item name="android:textColorLink">#0000ff</item>
</style>
<style name="TextAppearancePrimaryItem">
<item name="android:textSize">@dimen/text_font_size_normal</item>
<item name="android:textColor">@color/primary_text_dark</item>
</style>
<style name="TextAppearanceSecondaryItem">
<item name="android:textSize">@dimen/text_font_size_small</item>
<item name="android:textColor">@color/secondary_text_dark</item>
</style>
<style name="TextAppearanceSuper">
<item name="android:textSize">@dimen/text_font_size_super</item>
<item name="android:textColorLink">#0000ff</item>
</style>
<style name="TextAppearanceUnderMenuIcon">
<item name="android:textSize">@dimen/text_font_size_normal</item>
<item name="android:textColor">@android:color/black</item>
</style>
</resources>

@ -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:\xiaomi_Note\src\Notes-master\app\src\main\assets"><file name="font/STLITI.TTF" path="D:\xiaomi_Note\src\Notes-master\app\src\main\assets\font\STLITI.TTF"/><file name="font/STHUPO.TTF" path="D:\xiaomi_Note\src\Notes-master\app\src\main\assets\font\STHUPO.TTF"/><file name="font/SIMYOU.TTF" path="D:\xiaomi_Note\src\Notes-master\app\src\main\assets\font\SIMYOU.TTF"/><file name="font/STXINWEI.TTF" path="D:\xiaomi_Note\src\Notes-master\app\src\main\assets\font\STXINWEI.TTF"/><file name="font/楷体_GB2312.ttf" path="D:\xiaomi_Note\src\Notes-master\app\src\main\assets\font\楷体_GB2312.ttf"/><file name="font/STKAITI.TTF" path="D:\xiaomi_Note\src\Notes-master\app\src\main\assets\font\STKAITI.TTF"/><file name="font/simhei.ttf" path="D:\xiaomi_Note\src\Notes-master\app\src\main\assets\font\simhei.ttf"/><file name="font/STXINGKA.TTF" path="D:\xiaomi_Note\src\Notes-master\app\src\main\assets\font\STXINGKA.TTF"/><file name="font/STCAIYUN.TTF" path="D:\xiaomi_Note\src\Notes-master\app\src\main\assets\font\STCAIYUN.TTF"/><file name="font/仿宋_GB2312.ttf" path="D:\xiaomi_Note\src\Notes-master\app\src\main\assets\font\仿宋_GB2312.ttf"/></source><source path="D:\xiaomi_Note\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\xiaomi_Note\src\Notes-master\app\src\debug\assets"/></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:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\assets"/><source path="D:\xiaomi\xiaomi_Note\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\debug\assets"/></dataSet></merger>

@ -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:\xiaomi_Note\src\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:\xiaomi_Note\src\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:\xiaomi\xiaomi_Note\src\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:\xiaomi\xiaomi_Note\src\Notes-master\app\src\debug\jniLibs"/></dataSet></merger>

@ -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:\xiaomi_Note\src\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:\xiaomi_Note\src\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:\xiaomi\xiaomi_Note\src\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:\xiaomi\xiaomi_Note\src\Notes-master\app\src\debug\shaders"/></dataSet></merger>

@ -1,4 +1,9 @@
<<<<<<< HEAD
#Sun Oct 23 23:50:26 CST 2022
base.0=D\:\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
=======
#Sat Oct 22 08:49:05 CST 2022
base.0=D\:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
renamed.0=classes.dex
path.0=classes.dex

@ -21,117 +21,117 @@
21
22 <uses-sdk
23 android:minSdkVersion="11"
23-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml
23-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml
24 android:targetSdkVersion="30" />
24-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml
24-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml
25
26 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
26-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:5-81
26-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:22-78
26-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:5-81
26-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:22-78
27 <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
27-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-88
27-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-85
27-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-88
27-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-85
28 <uses-permission android:name="android.permission.INTERNET" />
28-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-67
28-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-64
28-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-67
28-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-64
29 <uses-permission android:name="android.permission.READ_CONTACTS" />
29-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-72
29-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-69
29-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-72
29-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-69
30 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
30-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-74
30-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-71
30-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-74
30-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-71
31 <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
31-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-80
31-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-77
31-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-80
31-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-77
32 <uses-permission android:name="android.permission.GET_ACCOUNTS" />
32-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-71
32-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-68
32-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-71
32-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-68
33 <uses-permission android:name="android.permission.USE_CREDENTIALS" />
33-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-74
33-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-71
33-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-74
33-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-71
34 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
34-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-81
34-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-78
34-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-81
34-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-78
35
36 <application
36-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:34:5-210:19
36-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:34:5-210:19
37 android:debuggable="true"
38 android:icon="@drawable/icon_app"
38-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:35:9-42
38-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:35:9-42
39 android:label="@string/app_name"
39-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-41
39-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-41
40 android:testOnly="true" >
41 <activity
41-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
41-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
42 android:name="net.micode.notes.ui.LoginActivity"
42-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-45
42-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-45
43 android:configChanges="keyboardHidden|orientation|screenSize"
43-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
43-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
44 android:label="@string/app_name"
44-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
44-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
45 android:launchMode="singleTop"
45-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
45-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
46 android:theme="@style/NoteTheme"
46-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
46-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
47 android:windowSoftInputMode="adjustPan" >
47-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
47-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
48
49 <!-- android:uiOptions="splitActionBarWhenNarrow" -->
50 <intent-filter>
50-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
50-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
51 <action android:name="android.intent.action.MAIN" />
51-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
51-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
51-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
51-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
52
53 <category android:name="android.intent.category.LAUNCHER" />
53-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
53-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
53-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
53-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
54 </intent-filter>
55 </activity>
56 <activity
56-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-59:20
56-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-59:20
57 android:name="net.micode.notes.ui.ChangingPassword"
57-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48
57-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48
58 android:configChanges="keyboardHidden|orientation|screenSize"
58-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
58-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
59 android:label="@string/app_name"
59-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-45
59-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-45
60 android:launchMode="singleTop"
60-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
60-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
61 android:theme="@style/NoteTheme"
61-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
61-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
62 android:windowSoftInputMode="adjustPan" >
62-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-52
62-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-52
63 </activity>
64 <activity
64-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:61:9-68:20
64-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:61:9-68:20
65 android:name="net.micode.notes.ui.SettingPassword"
65-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:62:13-47
65-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:62:13-47
66 android:configChanges="keyboardHidden|orientation|screenSize"
66-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:63:13-74
66-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:63:13-74
67 android:label="@string/app_name"
67-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:64:13-45
67-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:64:13-45
68 android:launchMode="singleTop"
68-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-43
68-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-43
69 android:theme="@style/NoteTheme"
69-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-45
69-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-45
70 android:windowSoftInputMode="adjustPan" >
70-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:67:13-52
70-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:67:13-52
71 </activity>
72 <activity
72-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:70:9-77:20
72-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:70:9-77:20
73 android:name="net.micode.notes.ui.DeletingPassword"
73-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:71:13-48
73-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:71:13-48
74 android:configChanges="keyboardHidden|orientation|screenSize"
74-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-74
74-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-74
75 android:label="@string/app_name"
75-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-45
75-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-45
76 android:launchMode="singleTop"
76-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:74:13-43
76-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:74:13-43
77 android:theme="@style/NoteTheme"
77-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:75:13-45
77-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:75:13-45
78 android:windowSoftInputMode="adjustPan" >
78-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:76:13-52
78-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:76:13-52
79 </activity>
80
81 <!-- <activity -->
@ -144,19 +144,19 @@
88 <!-- </activity> -->
89
90 <activity
90-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:90:9-102:20
90-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:90:9-102:20
91 android:name="net.micode.notes.ui.NotesListActivity"
91-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-49
91-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-49
92 android:configChanges="keyboardHidden|orientation|screenSize"
92-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:92:13-74
92-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:92:13-74
93 android:label="@string/app_name"
93-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:93:13-45
93-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:93:13-45
94 android:launchMode="singleTop"
94-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:94:13-43
94-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:94:13-43
95 android:theme="@style/NoteTheme"
95-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:95:13-45
95-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:95:13-45
96 android:windowSoftInputMode="adjustPan" >
96-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-52
96-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-52
97
98 <!-- android:uiOptions="splitActionBarWhenNarrow" -->
99 <!-- <intent-filter> -->
@ -165,190 +165,190 @@
102 <!-- </intent-filter> -->
103 </activity>
104 <activity
104-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:104:9-136:20
104-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:104:9-136:20
105 android:name="net.micode.notes.ui.NoteEditActivity"
105-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:105:13-48
105-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:105:13-48
106 android:configChanges="keyboardHidden|orientation|screenSize"
106-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:106:13-74
106-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:106:13-74
107 android:launchMode="singleTop"
107-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:107:13-43
107-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:107:13-43
108 android:theme="@style/NoteTheme" >
108-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:108:13-45
108-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:108:13-45
109 <intent-filter>
109-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:110:13-115:29
109-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:110:13-115:29
110 <action android:name="android.intent.action.INSERT_OR_EDIT" />
110-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:17-79
110-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:25-76
110-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:17-79
110-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:25-76
111
112 <category android:name="android.intent.category.DEFAULT" />
112-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76
112-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73
112-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76
112-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73
113
114 <data android:mimeType="vnd.android.cursor.item/text_note" />
114-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
114-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
114-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
114-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
115 <data android:mimeType="vnd.android.cursor.item/call_note" />
115-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
115-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
115-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
115-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
116 </intent-filter>
117 <intent-filter>
117-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-120:29
117-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-120:29
118 <action android:name="android.intent.action.SEARCH" />
118-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-71
118-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-68
118-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-71
118-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-68
119
120 <category android:name="android.intent.category.DEFAULT" />
120-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76
120-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73
120-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76
120-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73
121 </intent-filter>
122 <intent-filter>
122-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-127:29
122-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-127:29
123 <action android:name="android.intent.action.VIEW" />
123-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:17-69
123-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:25-66
123-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:17-69
123-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:25-66
124
125 <category android:name="android.intent.category.DEFAULT" />
125-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76
125-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73
125-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76
125-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73
126
127 <data android:mimeType="vnd.android.cursor.item/text_note" />
127-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
127-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
127-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
127-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
128 <data android:mimeType="vnd.android.cursor.item/call_note" />
128-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
128-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
128-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78
128-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75
129 </intent-filter>
130
131 <meta-data
131-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-132:54
131-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-132:54
132 android:name="android.app.searchable"
132-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:131:17-54
132-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:131:17-54
133 android:resource="@xml/searchable" />
133-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:132:17-51
133-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:132:17-51
134 <!-- <meta-data>必须包括android:name这个属性而且其值必须为"android.app.searchable" -->
135 <!-- 还必须包括android:resource这个属性它指定了我们的search dialog的配置文件。 -->
136
137 </activity>
138
139 <provider
139-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:138:9-143:20
139-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:138:9-143:20
140 android:name="net.micode.notes.data.NotesProvider"
140-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:139:13-63
140-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:139:13-63
141 android:authorities="micode_notes"
141-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:140:13-47
141-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:140:13-47
142 android:exported="false"
142-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-37
142-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-37
143 android:multiprocess="true" >
143-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-40
143-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-40
144 </provider>
145
146 <receiver
146-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-157:20
146-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-157:20
147 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
147-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-57
147-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-57
148 android:label="@string/app_widget2x2" >
148-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-50
148-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-50
149 <intent-filter>
149-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29
149-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29
150 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
150-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84
150-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81
150-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84
150-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81
151 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
151-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85
151-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82
151-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85
151-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82
152 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
152-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85
152-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82
152-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85
152-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82
153 </intent-filter>
154
155 <meta-data
155-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58
155-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58
156 android:name="android.appwidget.provider"
156-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58
156-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58
157 android:resource="@xml/widget_2x_info" />
157-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55
157-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55
158 </receiver>
159 <receiver
159-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:159:9-172:20
159-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:159:9-172:20
160 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
160-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:160:13-57
160-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:160:13-57
161 android:label="@string/app_widget4x4" >
161-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:161:13-50
161-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:161:13-50
162 <intent-filter>
162-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29
162-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29
163 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
163-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84
163-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81
163-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84
163-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81
164 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
164-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85
164-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82
164-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85
164-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82
165 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
165-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85
165-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82
165-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85
165-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82
166 </intent-filter>
167
168 <meta-data
168-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58
168-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58
169 android:name="android.appwidget.provider"
169-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58
169-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58
170 android:resource="@xml/widget_4x_info" />
170-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55
170-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55
171 </receiver>
172 <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
172-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:9-178:20
172-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:19-55
172-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:9-178:20
172-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:19-55
173 <intent-filter>
173-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:175:13-177:29
173-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:175:13-177:29
174 <action android:name="android.intent.action.BOOT_COMPLETED" />
174-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:17-79
174-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:25-76
174-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:17-79
174-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:25-76
175 </intent-filter>
176 </receiver>
177 <receiver
177-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:180:9-183:20
177-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:180:9-183:20
178 android:name="net.micode.notes.ui.AlarmReceiver"
178-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:181:13-61
178-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:181:13-61
179 android:process=":remote" >
179-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:182:13-38
179-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:182:13-38
180 </receiver>
181
182 <activity
182-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:185:9-190:20
182-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:185:9-190:20
183 android:name="net.micode.notes.ui.AlarmAlertActivity"
183-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:186:13-50
183-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:186:13-50
184 android:label="@string/app_name"
184-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:187:13-45
184-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:187:13-45
185 android:launchMode="singleInstance"
185-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:188:13-48
185-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:188:13-48
186 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
186-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:189:13-75
186-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:189:13-75
187 </activity>
188 <activity
188-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:192:9-197:20
188-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:192:9-197:20
189 android:name="net.micode.notes.ui.NotesPreferenceActivity"
189-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:193:13-71
189-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:193:13-71
190 android:label="@string/preferences_title"
190-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:194:13-54
190-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:194:13-54
191 android:launchMode="singleTop"
191-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:195:13-43
191-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:195:13-43
192 android:theme="@android:style/Theme.Holo.Light" >
192-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:196:13-60
192-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:196:13-60
193 </activity>
194
195 <service
195-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:199:9-202:19
195-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:199:9-202:19
196 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
196-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:200:13-74
196-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:200:13-74
197 android:exported="false" >
197-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:201:13-37
197-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:201:13-37
198 </service>
199
200 <meta-data
200-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:204:9-206:52
200-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:204:9-206:52
201 android:name="android.app.default_searchable"
201-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:205:13-58
201-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:205:13-58
202 android:value=".ui.NoteEditActivity" />
202-->D:\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:206:13-49
202-->D:\xiaomi\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:206:13-49
203 <!--
204 如果你想为你的应用程序的每个activity 都提供该search dialog, 那么将<meta-data>元素加入<application>中,
205 通过这种方式, 每个activity 都继承了该值, 提供search dialog, 并把searches传送到同一个searchable activity.

@ -4,7 +4,11 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
<<<<<<< HEAD
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
=======
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
"from": {
"startLines": "-1",
"startColumns": "-1",
@ -20,6 +24,7 @@
}
},
{
<<<<<<< HEAD
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
@ -35,11 +40,29 @@
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2700,2747,2797,2842,2901,2953,3005,3048,3095,3151,3206,3261,3305,3347,3388,3438,3497,3548,3597,3646,3693,3740,3787,3832,3883,3936,4011,4070,4127,4201,4265,4334,4412,4522,4626,4699,4765,4820,4885,4950,4999,5082,5160,5198,5243,5291,5353,5410,5465,5524,5591,5649,5711,5759,5804,5852,5903,5969,6035"
=======
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,122,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6703,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6752,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2213,2256,2307,2357,2417,2470,2521,2567,2615,2663,2709,2758,2805,2855,2900,2959,3011,3063,3106,3153,3209,3264,3319,3363,3405,3446,3496,3555,3606,3655,3704,3751,3798,3845,3890,3941,3994,4069,4128,4185,4259,4323,4392,4470,4580,4684,4757,4823,4878,4943,5008,5057,5140,5218,5256,5301,5349,5411,5468,5523,5582,5649,5707,5769,5817,5862,5910,5961,6027",
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2208,2251,2302,2352,2412,2465,2516,2562,2610,2658,2704,2753,2800,2850,2895,2954,3006,3058,3101,3148,3204,3259,3314,3358,3400,3441,3491,3550,3601,3650,3699,3746,3793,3840,3885,3936,3989,4064,4123,4180,4254,4318,4387,4465,4575,4679,4752,4818,4873,4938,5003,5052,5135,5213,5251,5296,5344,5406,5463,5518,5577,5644,5702,5764,5812,5857,5905,5956,6022,6088"
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
}
}
]
},
{
<<<<<<< HEAD
"outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
"map": [
{
@ -226,6 +249,12 @@
},
{
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
=======
"outputFile": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat",
"map": [
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
"from": {
"startLines": "19,26",
"startColumns": "4,4",
@ -244,7 +273,11 @@
}
},
{
<<<<<<< HEAD
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
=======
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
"from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
@ -254,6 +287,7 @@
"endOffsets": "2314,2531,2918,2696,1098,1287,1476,1685,1897,911,2104"
},
"to": {
<<<<<<< HEAD
"startLines": "127,131,135,139,142,146,150,154,158,162,166",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8238,8442,8653,8826,8986,9169,9354,9539,9742,9948,10131",
@ -299,15 +333,83 @@
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2698,2745,2795,2840,2899,2951,3003,3046,3093,3149,3204,3259,3303,3345,3386,3436,3495,3546,3595,3644,3691,3738,3785,3830,3881,3934,4009,4068,4125,4199,4263,4332,4410,4520,4624,4697,4763,4818,4883,4948,4997,5080,5158,5196,5241,5289,5351,5408,5463,5522,5589,5647,5709,5757,5802,5850,5901,5967,6033"
=======
"startLines": "128,132,136,140,143,147,151,155,159,163,167",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8294,8498,8709,8882,9042,9225,9410,9595,9798,10004,10187",
"endLines": "131,135,139,142,146,150,154,158,162,166,170",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8493,8704,8877,9037,9220,9405,9590,9793,9999,10182,10383"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
"startOffsets": "730",
"endColumns": "56",
"endOffsets": "782"
},
"to": {
"startLines": "12",
"startColumns": "4",
"startOffsets": "420",
"endColumns": "56",
"endOffsets": "472"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "132,119,73,76,75,74,19,20,21,122,123,131,130,120,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,124,72,68,42,48,53,43,64,63,62,57,56,54,55,59,58,60,49,71,61,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,129,127,126,128,27,84,92,97,96,98,91,90,89,88,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8311,7681,4027,4291,4194,4124,846,890,943,7799,7849,8252,8200,7736,1308,4751,4846,4679,4594,4510,5725,5641,5538,5024,2043,1991,3518,1515,1569,5086,2138,4375,7913,3955,3706,2198,2519,2825,2257,3446,3384,3326,3043,2990,2885,2939,3145,3094,3202,2567,3888,3263,3756,2471,2769,2680,2621,3643,2420,3597,2315,2359,3820,1459,1784,1894,1736,1840,1679,1630,1252,1198,6188,6120,6432,7582,6801,6719,6876,6966,7210,7130,6273,6349,6659,6497,6578,6064,7355,7478,8158,8029,7971,8083,1393,4955,5451,5862,5792,5943,5391,5335,5272,5211,996,1107",
"endLines": "136,119,73,76,75,74,19,20,21,122,123,131,130,120,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,124,72,68,42,48,53,43,64,63,62,57,56,54,55,59,58,60,49,71,61,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,129,127,126,128,27,84,92,97,96,98,91,90,89,88,22,23",
"endColumns": "14,53,95,82,95,68,42,51,51,48,62,57,50,59,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "8719,7730,4118,4369,4285,4188,884,937,990,7843,7907,8305,8246,7791,1387,4840,4949,4745,4673,4588,5786,5719,5635,5080,2100,2037,3591,1563,1624,5186,2192,4472,7963,4021,3750,2251,2561,2879,2309,3512,3440,3378,3088,3037,2933,2984,3196,3139,3257,2615,3949,3320,3814,2513,2819,2763,2674,3700,2465,3637,2353,2414,3882,1509,1834,1942,1778,1888,1730,1673,1302,1246,6267,6182,6491,7673,6870,6795,6960,7124,7349,7204,6343,6426,6713,6572,6653,6114,7472,7576,8194,8077,8023,8152,1453,5018,5532,5937,5856,6032,5445,5385,5329,5266,1101,1192"
},
"to": {
"startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "739,1092,1146,1242,1325,1421,1490,1533,1585,1637,1686,1749,1807,1858,1918,2002,2096,2204,2275,2359,2442,2508,2591,2693,2754,2816,2867,2945,2998,3058,3163,3222,3324,3379,3450,3499,3557,3604,3663,3720,3791,3852,3909,3959,4011,4064,4114,4170,4220,4280,4333,4399,4461,4524,4571,4626,4714,4772,4834,4884,4929,4972,5032,5099,5154,5209,5262,5309,5362,5418,5466,5521,5574,5658,5725,5789,5885,5959,6040,6129,6292,6436,6515,6590,6672,6731,6811,6891,6946,7068,7171,7212,7265,7322,7396,7461,7529,7615,7695,7764,7858,7917,7972,8034,8094,8204",
"endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
"endColumns": "14,53,95,82,95,68,42,51,51,48,62,57,50,59,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "1087,1141,1237,1320,1416,1485,1528,1580,1632,1681,1744,1802,1853,1913,1997,2091,2199,2270,2354,2437,2503,2586,2688,2749,2811,2862,2940,2993,3053,3158,3217,3319,3374,3445,3494,3552,3599,3658,3715,3786,3847,3904,3954,4006,4059,4109,4165,4215,4275,4328,4394,4456,4519,4566,4621,4709,4767,4829,4879,4924,4967,5027,5094,5149,5204,5257,5304,5357,5413,5461,5516,5569,5653,5720,5784,5880,5954,6035,6124,6287,6431,6510,6585,6667,6726,6806,6886,6941,7063,7166,7207,7260,7317,7391,7456,7524,7610,7690,7759,7853,7912,7967,8029,8089,8199,8289"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
"startOffsets": "783,836,890,944,730",
"endColumns": "51,52,52,51,51",
"endOffsets": "830,884,938,991,777"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
}
}
]
},
{
<<<<<<< HEAD
"outputFile": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
=======
"outputFile": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
"from": {
"startLines": "18",
"startColumns": "4",
@ -326,6 +428,7 @@
}
},
{
<<<<<<< HEAD
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
@ -342,6 +445,153 @@
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
=======
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "123,73,72,71,70,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,62,29,30,81,37,115,69,65,39,45,50,40,61,60,59,54,53,51,52,56,55,57,46,68,58,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6679,3697,3630,3556,3505,846,887,936,6219,6265,6624,6573,1225,3961,4030,3901,3834,3770,4704,4643,4579,4164,3068,1398,1452,4219,1805,6323,3445,3228,1917,2204,2455,1971,3007,2953,2901,2652,2603,2507,2556,2747,2699,2797,2248,3385,2848,3272,2160,2407,2350,2294,3172,2115,3129,2022,2064,3325,1346,1657,1755,1609,1707,1561,1515,1173,1119,5086,5026,5229,6142,5545,5475,5610,5689,5874,5800,5162,5419,5287,5353,4976,5979,6063,6534,6425,6376,6471,1288,4108,4519,4819,4760,4887,4470,4424,4375,4323,985,1052",
"endLines": "125,73,72,71,70,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,62,29,30,81,37,115,69,65,39,45,50,40,61,60,59,54,53,51,52,56,55,57,46,68,58,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6853,3764,3691,3624,3550,881,930,979,6259,6317,6673,6618,1282,4024,4102,3955,3895,3828,4754,4698,4637,4213,3123,1446,1509,4298,1880,6368,3499,3266,1965,2242,2501,2016,3062,3001,2947,2693,2646,2550,2597,2791,2741,2842,2288,3439,2895,3319,2198,2449,2401,2344,3222,2154,3166,2058,2109,3379,1392,1701,1799,1651,1749,1603,1555,1219,1167,5156,5080,5281,6211,5604,5539,5683,5794,5973,5868,5223,5469,5347,5413,5020,6057,6136,6567,6465,6419,6528,1340,4158,4573,4881,4813,4944,4513,4464,4418,4369,1046,1113"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2703,2750,2800,2845,2904,2956,3008,3051,3098,3154,3209,3264,3308,3350,3391,3441,3500,3551,3600,3649,3696,3743,3790,3835,3886,3939,4014,4073,4130,4204,4268,4337,4415,4525,4629,4702,4768,4823,4888,4953,5002,5085,5163,5201,5246,5294,5356,5413,5468,5527,5594,5652,5714,5762,5807,5855,5906,5972",
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2698,2745,2795,2840,2899,2951,3003,3046,3093,3149,3204,3259,3303,3345,3386,3436,3495,3546,3595,3644,3691,3738,3785,3830,3881,3934,4009,4068,4125,4199,4263,4332,4410,4520,4624,4697,4763,4818,4883,4948,4997,5080,5158,5196,5241,5289,5351,5408,5463,5522,5589,5647,5709,5757,5802,5850,5901,5967,6033"
}
}
]
},
{
"outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
"map": [
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "-1,-1",
"startColumns": "-1,-1",
"startOffsets": "-1,-1"
},
"to": {
"startLines": "2,8",
"startColumns": "4,4",
"startOffsets": "105,300",
"endLines": "7,11",
"endColumns": "19,19",
"endOffsets": "295,415"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
"startLines": "129,133,137,141,144,148,152,156,160,164,168",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8378,8582,8793,8966,9126,9309,9494,9679,9882,10088,10271",
"endLines": "132,136,140,143,147,151,155,159,163,167,171",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8577,8788,8961,9121,9304,9489,9674,9877,10083,10266,10467"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "-1",
"startColumns": "-1",
"startOffsets": "-1"
},
"to": {
"startLines": "12",
"startColumns": "4",
"startOffsets": "420",
"endColumns": "56",
"endOffsets": "472"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "8396,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8311,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endLines": "137,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,83,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "8804,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8390,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
"startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "739,1092,1146,1242,1325,1421,1490,1533,1585,1637,1686,1749,1807,1858,1918,2002,2096,2204,2275,2359,2442,2508,2591,2693,2754,2816,2867,2945,2998,3058,3163,3222,3324,3379,3450,3499,3583,3641,3688,3747,3804,3875,3936,3993,4043,4095,4148,4198,4254,4304,4364,4417,4483,4545,4608,4655,4710,4798,4856,4918,4968,5013,5056,5116,5183,5238,5293,5346,5393,5446,5502,5550,5605,5658,5742,5809,5873,5969,6043,6124,6213,6376,6520,6599,6674,6756,6815,6895,6975,7030,7152,7255,7296,7349,7406,7480,7545,7613,7699,7779,7848,7942,8001,8056,8118,8178,8288",
"endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128",
"endColumns": "14,53,95,82,95,68,42,51,51,48,62,57,50,59,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,83,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "1087,1141,1237,1320,1416,1485,1528,1580,1632,1681,1744,1802,1853,1913,1997,2091,2199,2270,2354,2437,2503,2586,2688,2749,2811,2862,2940,2993,3053,3158,3217,3319,3374,3445,3494,3578,3636,3683,3742,3799,3870,3931,3988,4038,4090,4143,4193,4249,4299,4359,4412,4478,4540,4603,4650,4705,4793,4851,4913,4963,5008,5051,5111,5178,5233,5288,5341,5388,5441,5497,5545,5600,5653,5737,5804,5868,5964,6038,6119,6208,6371,6515,6594,6669,6751,6810,6890,6970,7025,7147,7250,7291,7344,7401,7475,7540,7608,7694,7774,7843,7937,7996,8051,8113,8173,8283,8373"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
}
}
]
},
{
"outputFile": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
"startOffsets": "730",
"endLines": "21",
"endColumns": "19",
"endOffsets": "838"
},
"to": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "105",
"endLines": "5",
"endColumns": "19",
"endOffsets": "210"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "122,72,71,70,69,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,61,29,30,82,73,115,68,64,38,44,49,39,60,59,58,53,52,50,51,55,54,56,45,67,57,65,43,48,47,46,63,42,62,40,41,66,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6703,3616,3549,3475,3424,846,887,936,6245,6291,6648,6597,1225,3988,4057,3928,3862,3798,4732,4671,4607,4191,2987,1398,1452,4246,3690,6349,3364,3147,1836,2123,2374,1890,2926,2872,2820,2571,2522,2426,2475,2666,2618,2716,2167,3304,2767,3191,2079,2326,2269,2213,3091,2034,3048,1941,1983,3244,1346,1657,1755,1609,1707,1561,1515,1173,1119,5114,5054,5257,6170,5573,5503,5638,5717,5902,5828,5190,5447,5315,5381,5004,6007,6091,6558,6449,6400,6495,1288,4135,4547,4847,4788,4915,4498,4452,4403,4351,985,1052",
"endLines": "124,72,71,70,69,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,61,29,30,82,73,115,68,64,38,44,49,39,60,59,58,53,52,50,51,55,54,56,45,67,57,65,43,48,47,46,63,42,62,40,41,66,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6877,3684,3610,3543,3469,881,930,979,6285,6343,6697,6642,1282,4051,4129,3982,3922,3856,4782,4726,4665,4240,3042,1446,1509,4326,3766,6394,3418,3185,1884,2161,2420,1935,2981,2920,2866,2612,2565,2469,2516,2710,2660,2761,2207,3358,2814,3238,2117,2368,2320,2263,3141,2073,3085,1977,2028,3298,1392,1701,1799,1651,1749,1603,1555,1219,1167,5184,5108,5309,6239,5632,5567,5711,5822,6001,5896,5251,5497,5375,5441,5048,6085,6164,6591,6489,6443,6552,1340,4185,4601,4909,4841,4972,4541,4492,4446,4397,1046,1113"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2705,2752,2802,2847,2906,2958,3010,3053,3100,3156,3211,3266,3310,3352,3393,3443,3502,3553,3602,3651,3698,3745,3792,3837,3888,3941,4016,4075,4132,4206,4270,4339,4417,4527,4631,4704,4770,4825,4890,4955,5004,5087,5165,5203,5248,5296,5358,5415,5470,5529,5596,5654,5716,5764,5809,5857,5908,5974",
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2700,2747,2797,2842,2901,2953,3005,3048,3095,3151,3206,3261,3305,3347,3388,3438,3497,3548,3597,3646,3693,3740,3787,3832,3883,3936,4011,4070,4127,4201,4265,4334,4412,4522,4626,4699,4765,4820,4885,4950,4999,5082,5160,5198,5243,5291,5353,5410,5465,5524,5591,5649,5711,5759,5804,5852,5903,5969,6035"
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
}
}
]

@ -1,10 +1,56 @@
{
"logs": [
{
<<<<<<< HEAD
"outputFile": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml",
"map": [
{
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
=======
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
"map": [
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "-1",
"startColumns": "-1",
"startOffsets": "-1"
},
"to": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "105",
"endLines": "5",
"endColumns": "19",
"endOffsets": "210"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,122,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6703,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6752,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2213,2256,2307,2357,2417,2470,2521,2567,2615,2663,2709,2758,2805,2855,2900,2959,3011,3063,3106,3153,3209,3264,3319,3363,3405,3446,3496,3555,3606,3655,3704,3751,3798,3845,3890,3941,3994,4069,4128,4185,4259,4323,4392,4470,4580,4684,4757,4823,4878,4943,5008,5057,5140,5218,5256,5301,5349,5411,5468,5523,5582,5649,5707,5769,5817,5862,5910,5961,6027",
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2208,2251,2302,2352,2412,2465,2516,2562,2610,2658,2704,2753,2800,2850,2895,2954,3006,3058,3101,3148,3204,3259,3314,3358,3400,3441,3491,3550,3601,3650,3699,3746,3793,3840,3885,3936,3989,4064,4123,4180,4254,4318,4387,4465,4575,4679,4752,4818,4873,4938,5003,5052,5135,5213,5251,5296,5344,5406,5463,5518,5577,5644,5702,5764,5812,5857,5905,5956,6022,6088"
}
}
]
},
{
"outputFile": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml",
"map": [
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
"from": {
"startLines": "18",
"startColumns": "4",
@ -23,6 +69,7 @@
}
},
{
<<<<<<< HEAD
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
@ -70,6 +117,16 @@
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2666,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2710,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
=======
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "122,72,71,70,69,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,61,29,30,82,73,115,68,64,38,44,49,39,60,59,58,53,52,50,51,55,54,56,45,67,57,65,43,48,47,46,63,42,62,40,41,66,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6703,3616,3549,3475,3424,846,887,936,6245,6291,6648,6597,1225,3988,4057,3928,3862,3798,4732,4671,4607,4191,2987,1398,1452,4246,3690,6349,3364,3147,1836,2123,2374,1890,2926,2872,2820,2571,2522,2426,2475,2666,2618,2716,2167,3304,2767,3191,2079,2326,2269,2213,3091,2034,3048,1941,1983,3244,1346,1657,1755,1609,1707,1561,1515,1173,1119,5114,5054,5257,6170,5573,5503,5638,5717,5902,5828,5190,5447,5315,5381,5004,6007,6091,6558,6449,6400,6495,1288,4135,4547,4847,4788,4915,4498,4452,4403,4351,985,1052",
"endLines": "124,72,71,70,69,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,61,29,30,82,73,115,68,64,38,44,49,39,60,59,58,53,52,50,51,55,54,56,45,67,57,65,43,48,47,46,63,42,62,40,41,66,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6877,3684,3610,3543,3469,881,930,979,6285,6343,6697,6642,1282,4051,4129,3982,3922,3856,4782,4726,4665,4240,3042,1446,1509,4326,3766,6394,3418,3185,1884,2161,2420,1935,2981,2920,2866,2612,2565,2469,2516,2710,2660,2761,2207,3358,2814,3238,2117,2368,2320,2263,3141,2073,3085,1977,2028,3298,1392,1701,1799,1651,1749,1603,1555,1219,1167,5184,5108,5309,6239,5632,5567,5711,5822,6001,5896,5251,5497,5375,5441,5048,6085,6164,6591,6489,6443,6552,1340,4185,4601,4909,4841,4972,4541,4492,4446,4397,1046,1113"
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",

@ -1,10 +1,17 @@
{
"logs": [
{
<<<<<<< HEAD
"outputFile": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rTW\\values-zh-rTW.xml",
"map": [
{
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
=======
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
"map": [
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
"from": {
"startLines": "18",
"startColumns": "4",
@ -23,6 +30,7 @@
}
},
{
<<<<<<< HEAD
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
@ -70,6 +78,16 @@
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2747,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2791,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
=======
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "123,73,72,71,70,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,62,29,30,81,37,115,69,65,39,45,50,40,61,60,59,54,53,51,52,56,55,57,46,68,58,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6679,3697,3630,3556,3505,846,887,936,6219,6265,6624,6573,1225,3961,4030,3901,3834,3770,4704,4643,4579,4164,3068,1398,1452,4219,1805,6323,3445,3228,1917,2204,2455,1971,3007,2953,2901,2652,2603,2507,2556,2747,2699,2797,2248,3385,2848,3272,2160,2407,2350,2294,3172,2115,3129,2022,2064,3325,1346,1657,1755,1609,1707,1561,1515,1173,1119,5086,5026,5229,6142,5545,5475,5610,5689,5874,5800,5162,5419,5287,5353,4976,5979,6063,6534,6425,6376,6471,1288,4108,4519,4819,4760,4887,4470,4424,4375,4323,985,1052",
"endLines": "125,73,72,71,70,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,62,29,30,81,37,115,69,65,39,45,50,40,61,60,59,54,53,51,52,56,55,57,46,68,58,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6853,3764,3691,3624,3550,881,930,979,6259,6317,6673,6618,1282,4024,4102,3955,3895,3828,4754,4698,4637,4213,3123,1446,1509,4298,1880,6368,3499,3266,1965,2242,2501,2016,3062,3001,2947,2693,2646,2550,2597,2791,2741,2842,2288,3439,2895,3319,2198,2449,2401,2344,3222,2154,3166,2058,2109,3379,1392,1701,1799,1651,1749,1603,1555,1219,1167,5156,5080,5281,6211,5604,5539,5683,5794,5973,5868,5223,5469,5347,5413,5020,6057,6136,6567,6465,6419,6528,1340,4158,4573,4881,4813,4944,4513,4464,4418,4369,1046,1113"
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",

@ -1,6 +1,7 @@
{
"logs": [
{
<<<<<<< HEAD
"outputFile": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml",
"map": [
{
@ -28,6 +29,48 @@
"startOffsets": "730",
"endColumns": "56",
"endOffsets": "782"
=======
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
"map": [
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "-1,-1",
"startColumns": "-1,-1",
"startOffsets": "-1,-1"
},
"to": {
"startLines": "2,8",
"startColumns": "4,4",
"startOffsets": "105,300",
"endLines": "7,11",
"endColumns": "19,19",
"endOffsets": "295,415"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
"startLines": "129,133,137,141,144,148,152,156,160,164,168",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8378,8582,8793,8966,9126,9309,9494,9679,9882,10088,10271",
"endLines": "132,136,140,143,147,151,155,159,163,167,171",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8577,8788,8961,9121,9304,9489,9674,9877,10083,10266,10467"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "-1",
"startColumns": "-1",
"startOffsets": "-1"
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
},
"to": {
"startLines": "12",
@ -38,6 +81,7 @@
}
},
{
<<<<<<< HEAD
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "131,118,72,75,74,73,19,20,21,121,122,130,129,119,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,123,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,128,126,125,127,27,83,91,96,95,97,90,89,88,87,22,23",
@ -58,6 +102,48 @@
},
{
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
=======
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "8396,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8311,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endLines": "137,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,83,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "8804,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8390,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
"startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "739,1092,1146,1242,1325,1421,1490,1533,1585,1637,1686,1749,1807,1858,1918,2002,2096,2204,2275,2359,2442,2508,2591,2693,2754,2816,2867,2945,2998,3058,3163,3222,3324,3379,3450,3499,3583,3641,3688,3747,3804,3875,3936,3993,4043,4095,4148,4198,4254,4304,4364,4417,4483,4545,4608,4655,4710,4798,4856,4918,4968,5013,5056,5116,5183,5238,5293,5346,5393,5446,5502,5550,5605,5658,5742,5809,5873,5969,6043,6124,6213,6376,6520,6599,6674,6756,6815,6895,6975,7030,7152,7255,7296,7349,7406,7480,7545,7613,7699,7779,7848,7942,8001,8056,8118,8178,8288",
"endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128",
"endColumns": "14,53,95,82,95,68,42,51,51,48,62,57,50,59,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,83,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "1087,1141,1237,1320,1416,1485,1528,1580,1632,1681,1744,1802,1853,1913,1997,2091,2199,2270,2354,2437,2503,2586,2688,2749,2811,2862,2940,2993,3053,3158,3217,3319,3374,3445,3494,3578,3636,3683,3742,3799,3870,3931,3988,4038,4090,4143,4193,4249,4299,4359,4412,4478,4540,4603,4650,4705,4793,4851,4913,4963,5008,5051,5111,5178,5233,5288,5341,5388,5441,5497,5545,5600,5653,5737,5804,5868,5964,6038,6119,6208,6371,6515,6594,6669,6751,6810,6890,6970,7025,7147,7250,7291,7344,7401,7475,7540,7608,7694,7774,7843,7937,7996,8051,8113,8173,8283,8373"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
}
}
]
},
{
"outputFile": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml",
"map": [
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
"from": {
"startLines": "19,26",
"startColumns": "4,4",
@ -76,7 +162,11 @@
}
},
{
<<<<<<< HEAD
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
=======
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
"from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
@ -86,6 +176,7 @@
"endOffsets": "2314,2531,2918,2696,1098,1287,1476,1685,1897,911,2104"
},
"to": {
<<<<<<< HEAD
"startLines": "127,131,135,139,142,146,150,154,158,162,166",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8238,8442,8653,8826,8986,9169,9354,9539,9742,9948,10131",
@ -120,6 +211,24 @@
"startLines": "-1",
"startColumns": "-1",
"startOffsets": "-1"
=======
"startLines": "128,132,136,140,143,147,151,155,159,163,167",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8294,8498,8709,8882,9042,9225,9410,9595,9798,10004,10187",
"endLines": "131,135,139,142,146,150,154,158,162,166,170",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8493,8704,8877,9037,9220,9405,9590,9793,9999,10182,10383"
}
},
{
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
"startOffsets": "730",
"endColumns": "56",
"endOffsets": "782"
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
},
"to": {
"startLines": "12",
@ -130,6 +239,7 @@
}
},
{
<<<<<<< HEAD
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,59,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
@ -138,6 +248,16 @@
"endLines": "136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,59,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "8719,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3196,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
=======
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "132,119,73,76,75,74,19,20,21,122,123,131,130,120,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,124,72,68,42,48,53,43,64,63,62,57,56,54,55,59,58,60,49,71,61,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,129,127,126,128,27,84,92,97,96,98,91,90,89,88,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8311,7681,4027,4291,4194,4124,846,890,943,7799,7849,8252,8200,7736,1308,4751,4846,4679,4594,4510,5725,5641,5538,5024,2043,1991,3518,1515,1569,5086,2138,4375,7913,3955,3706,2198,2519,2825,2257,3446,3384,3326,3043,2990,2885,2939,3145,3094,3202,2567,3888,3263,3756,2471,2769,2680,2621,3643,2420,3597,2315,2359,3820,1459,1784,1894,1736,1840,1679,1630,1252,1198,6188,6120,6432,7582,6801,6719,6876,6966,7210,7130,6273,6349,6659,6497,6578,6064,7355,7478,8158,8029,7971,8083,1393,4955,5451,5862,5792,5943,5391,5335,5272,5211,996,1107",
"endLines": "136,119,73,76,75,74,19,20,21,122,123,131,130,120,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,124,72,68,42,48,53,43,64,63,62,57,56,54,55,59,58,60,49,71,61,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,129,127,126,128,27,84,92,97,96,98,91,90,89,88,22,23",
"endColumns": "14,53,95,82,95,68,42,51,51,48,62,57,50,59,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,55,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "8719,7730,4118,4369,4285,4188,884,937,990,7843,7907,8305,8246,7791,1387,4840,4949,4745,4673,4588,5786,5719,5635,5080,2100,2037,3591,1563,1624,5186,2192,4472,7963,4021,3750,2251,2561,2879,2309,3512,3440,3378,3088,3037,2933,2984,3196,3139,3257,2615,3949,3320,3814,2513,2819,2763,2674,3700,2465,3637,2353,2414,3882,1509,1834,1942,1778,1888,1730,1673,1302,1246,6267,6182,6491,7673,6870,6795,6960,7124,7349,7204,6343,6426,6713,6572,6653,6114,7472,7576,8194,8077,8023,8152,1453,5018,5532,5937,5856,6032,5445,5385,5329,5266,1101,1192"
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
},
"to": {
"startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
@ -149,6 +269,7 @@
}
},
{
<<<<<<< HEAD
"source": "D:\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "-1,-1",
@ -178,6 +299,22 @@
"endLines": "131,135,139,142,146,150,154,158,162,166,170",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8493,8704,8877,9037,9220,9405,9590,9793,9999,10182,10383"
=======
"source": "D:\\xiaomi\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
"startOffsets": "783,836,890,944,730",
"endColumns": "51,52,52,51,51",
"endOffsets": "830,884,938,991,777"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
}
}
]

@ -1,5 +1,6 @@
[
{
<<<<<<< HEAD
"merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat",
"source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\preferences.xml"
},
@ -398,5 +399,405 @@
{
"merged": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat",
"source": "C:\\Users\\16592\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png"
=======
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_activity_set_loginpassword.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\activity_set_loginpassword.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\preferences.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\settings_header.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png"
},
{
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
"source": "net.micode.notes.app-main-7:/menu/note_list.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\searchable.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\raw\\introduction"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_edit.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_activity_change_password.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\activity_change_password.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_activity_delete_password.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\activity_delete_password.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable\\new_note.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_item.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_edit.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_activity_login.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\activity_login.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_list.xml"
},
{
"merged": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat",
"source": "C:\\Users\\Physicx\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png"
>>>>>>> c9b5cc7bede5c19e37002162cdc276adfc491d89
}
]

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

Loading…
Cancel
Save