Merge branch 'master' into cyx_branch
# Conflicts:
# .gradle/7.4.2/checksums/checksums.lock
# .gradle/7.4.2/checksums/md5-checksums.bin
# .gradle/7.4.2/checksums/sha1-checksums.bin
# .gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock
# .gradle/7.4.2/executionHistory/executionHistory.lock
# .gradle/7.4.2/fileChanges/last-build.bin
# .gradle/7.4.2/fileHashes/fileHashes.lock
# .gradle/7.5/fileHashes/resourceHashesCache.bin
# .idea/misc.xml
# .idea/workspace.xml
# app/build/intermediates/apk/debug/app-debug.apk
# app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
# app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
# app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
# app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
# app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
# app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
# app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
# app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
# app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
# app/build/intermediates/merged_res/debug/values_values.arsc.flat
# app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
# app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
# app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
# app/build/intermediates/processed_res/debug/out/resources-debug.ap_
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
# app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
# app/build/intermediates/runtime_symbol_list/debug/R.txt
# app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
# app/build/outputs/apk/debug/app-debug.apk
# app/build/outputs/apk/debug/output-metadata.json
# app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
# app/src/main/java/net/micode/notes/gtask/data/SqlData.java
# local.properties
# src/.gradle/7.5/executionHistory/executionHistory.bin
# src/.gradle/7.5/executionHistory/executionHistory.lock
# src/.gradle/7.5/fileHashes/fileHashes.bin
# src/.gradle/7.5/fileHashes/fileHashes.lock
# src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/.gradle/buildOutputCleanup/outputFiles.bin
# src/.gradle/file-system.probe
# src/.idea/modules.xml
# src/.idea/vcs.xml
# src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
# src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
# src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
# src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
# src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
# src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
# src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
# src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
# src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
# src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
# src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
# src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
# src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
# src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
# src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
# src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
# src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
# src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
# src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
# src/app/build/intermediates/source_set_path_map/debug/file-map.txt
# src/app/build/outputs/logs/manifest-merger-debug-report.txt
|
beitingnanxu
cyx13
邹兴云