5 Commits (dev)

Author	SHA1	Message	Date
day	58859aa6f2	alarm报错	3 years ago
宋经纬	b7a75059c2	Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # build/intermediates/apk/debug/sjw_Project-debug.apk # build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin # build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin # build/intermediates/dex/debug/mergeDexDebug/classes.dex # build/intermediates/dex_archive_input_jar_hashes/debug/out # build/intermediates/dex_number_of_buckets_file/debug/out # build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # build/intermediates/incremental/debug/mergeDebugResources/merger.xml # build/intermediates/incremental/mergeDebugAssets/merger.xml # build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml # build/intermediates/incremental/mergeDebugShaders/merger.xml # build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class # build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class # build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class # build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class # build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class # build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class # build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class # build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class # build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class # build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class # build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class # build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class # build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class # build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class # build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class # build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class # build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class # build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class # build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class # build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class # build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class # build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class # build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class # build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class # build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class # build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class # build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class # build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class # build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class # build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json # build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json # build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json # build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json # build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex # build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex # build/intermediates/signing_config_versions/debug/signing-config-versions.json # build/intermediates/source_set_path_map/debug/file-map.txt # build/outputs/logs/manifest-merger-debug-report.txt # build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin # local.properties	3 years ago
宋经纬	7036d3de33	代码标注	3 years ago
day	8e05ce2001	sbh	3 years ago
day	4bad1b9719	申博昊提交测试	3 years ago