LWY
|
94163669f8
|
Merge branch 'master' of http://bdgit.educoder.net/p96215407/pt3qbfalr into master
# Conflicts:
# src/src/.gradle/6.1.1/fileChanges/last-build.bin
# src/src/.gradle/6.1.1/fileHashes/resourceHashesCache.bin
# src/src/.gradle/checksums/md5-checksums.bin
# src/src/.idea/.gitignore
# src/src/.idea/codeStyles/Project.xml
# src/src/.idea/gradle.xml
# src/src/.idea/jarRepositories.xml
# src/src/.idea/misc.xml
# src/src/.idea/vcs.xml
# src/src/Notes-master/AndroidManifest.xml
# src/src/Notes-master/res/drawable-hdpi/bg_btn_set_color.png
# src/src/Notes-master/res/drawable-hdpi/bg_color_btn_mask.png
# src/src/Notes-master/res/drawable-hdpi/call_record.png
# src/src/Notes-master/res/drawable-hdpi/clock.png
# src/src/Notes-master/res/drawable-hdpi/delete.png
# src/src/Notes-master/res/drawable-hdpi/dropdown_icon.9.png
# src/src/Notes-master/res/drawable-hdpi/edit_blue.9.png
# src/src/Notes-master/res/drawable-hdpi/edit_green.9.png
# src/src/Notes-master/res/drawable-hdpi/edit_red.9.png
# src/src/Notes-master/res/drawable-hdpi/edit_title_blue.9.png
# src/src/Notes-master/res/drawable-hdpi/edit_title_green.9.png
# src/src/Notes-master/res/drawable-hdpi/edit_title_red.9.png
# src/src/Notes-master/res/drawable-hdpi/edit_title_white.9.png
# src/src/Notes-master/res/drawable-hdpi/edit_title_yellow.9.png
# src/src/Notes-master/res/drawable-hdpi/edit_white.9.png
# src/src/Notes-master/res/drawable-hdpi/edit_yellow.9.png
# src/src/Notes-master/res/drawable-hdpi/font_large.png
# src/src/Notes-master/res/drawable-hdpi/font_normal.png
# src/src/Notes-master/res/drawable-hdpi/font_size_selector_bg.9.png
# src/src/Notes-master/res/drawable-hdpi/font_small.png
# src/src/Notes-master/res/drawable-hdpi/font_super.png
# src/src/Notes-master/res/drawable-hdpi/icon_app.png
# src/src/Notes-master/res/drawable-hdpi/list_background.png
# src/src/Notes-master/res/drawable-hdpi/list_blue_down.9.png
# src/src/Notes-master/res/drawable-hdpi/list_blue_middle.9.png
# src/src/Notes-master/res/drawable-hdpi/list_blue_single.9.png
# src/src/Notes-master/res/drawable-hdpi/list_blue_up.9.png
# src/src/Notes-master/res/drawable-hdpi/list_folder.9.png
# src/src/Notes-master/res/drawable-hdpi/list_footer_bg.9.png
# src/src/Notes-master/res/drawable-hdpi/list_green_down.9.png
# src/src/Notes-master/res/drawable-hdpi/list_green_middle.9.png
# src/src/Notes-master/res/drawable-hdpi/list_green_single.9.png
# src/src/Notes-master/res/drawable-hdpi/list_green_up.9.png
# src/src/Notes-master/res/drawable-hdpi/list_red_down.9.png
# src/src/Notes-master/res/drawable-hdpi/list_red_middle.9.png
# src/src/Notes-master/res/drawable-hdpi/list_red_single.9.png
# src/src/Notes-master/res/drawable-hdpi/list_red_up.9.png
# src/src/Notes-master/res/drawable-hdpi/list_white_down.9.png
# src/src/Notes-master/res/drawable-hdpi/list_white_middle.9.png
# src/src/Notes-master/res/drawable-hdpi/list_white_single.9.png
# src/src/Notes-master/res/drawable-hdpi/list_white_up.9.png
# src/src/Notes-master/res/drawable-hdpi/list_yellow_down.9.png
# src/src/Notes-master/res/drawable-hdpi/list_yellow_middle.9.png
# src/src/Notes-master/res/drawable-hdpi/list_yellow_single.9.png
# src/src/Notes-master/res/drawable-hdpi/list_yellow_up.9.png
# src/src/Notes-master/res/drawable-hdpi/menu_delete.png
# src/src/Notes-master/res/drawable-hdpi/menu_move.png
# src/src/Notes-master/res/drawable-hdpi/new_note_normal.png
# src/src/Notes-master/res/drawable-hdpi/new_note_pressed.png
# src/src/Notes-master/res/drawable-hdpi/note_edit_color_selector_panel.png
# src/src/Notes-master/res/drawable-hdpi/notification.png
# src/src/Notes-master/res/drawable-hdpi/search_result.png
# src/src/Notes-master/res/drawable-hdpi/selected.png
# src/src/Notes-master/res/drawable-hdpi/title_alert.png
# src/src/Notes-master/res/drawable-hdpi/title_bar_bg.9.png
# src/src/Notes-master/res/drawable-hdpi/widget_2x_blue.png
# src/src/Notes-master/res/drawable-hdpi/widget_2x_green.png
# src/src/Notes-master/res/drawable-hdpi/widget_2x_red.png
# src/src/Notes-master/res/drawable-hdpi/widget_2x_white.png
# src/src/Notes-master/res/drawable-hdpi/widget_2x_yellow.png
# src/src/Notes-master/res/drawable-hdpi/widget_4x_blue.png
# src/src/Notes-master/res/drawable-hdpi/widget_4x_green.png
# src/src/Notes-master/res/drawable-hdpi/widget_4x_red.png
# src/src/Notes-master/res/drawable-hdpi/widget_4x_white.png
# src/src/Notes-master/res/drawable-hdpi/widget_4x_yellow.png
# src/src/Notes-master/res/drawable/new_note.xml
# src/src/Notes-master/res/layout/account_dialog_title.xml
# src/src/Notes-master/res/layout/add_account_text.xml
# src/src/Notes-master/res/layout/datetime_picker.xml
# src/src/Notes-master/res/layout/dialog_edit_text.xml
# src/src/Notes-master/res/layout/folder_list_item.xml
# src/src/Notes-master/res/layout/note_edit.xml
# src/src/Notes-master/res/layout/note_edit_list_item.xml
# src/src/Notes-master/res/layout/note_item.xml
# src/src/Notes-master/res/layout/note_list.xml
# src/src/Notes-master/res/layout/note_list_dropdown_menu.xml
# src/src/Notes-master/res/layout/note_list_footer.xml
# src/src/Notes-master/res/layout/settings_header.xml
# src/src/Notes-master/res/layout/widget_2x.xml
# src/src/Notes-master/res/layout/widget_4x.xml
# src/src/Notes-master/res/menu/call_note_edit.xml
# src/src/Notes-master/res/menu/call_record_folder.xml
# src/src/Notes-master/res/menu/note_edit.xml
# src/src/Notes-master/res/menu/note_list.xml
# src/src/Notes-master/res/menu/note_list_dropdown.xml
# src/src/Notes-master/res/menu/note_list_options.xml
# src/src/Notes-master/res/menu/sub_folder.xml
# src/src/Notes-master/res/raw-zh-rCN/introduction
# src/src/Notes-master/res/raw/introduction
# src/src/Notes-master/res/values-zh-rCN/arrays.xml
# src/src/Notes-master/res/values-zh-rCN/strings.xml
# src/src/Notes-master/res/values-zh-rTW/arrays.xml
# src/src/Notes-master/res/values-zh-rTW/strings.xml
# src/src/Notes-master/res/values/arrays.xml
# src/src/Notes-master/res/values/colors.xml
# src/src/Notes-master/res/values/dimens.xml
# src/src/Notes-master/res/values/strings.xml
# src/src/Notes-master/res/values/styles.xml
# src/src/Notes-master/res/xml/preferences.xml
# src/src/Notes-master/res/xml/searchable.xml
# src/src/Notes-master/res/xml/widget_2x_info.xml
# src/src/Notes-master/res/xml/widget_4x_info.xml
# src/src/Notes-master/src/net/micode/notes/data/Contact.java
# src/src/Notes-master/src/net/micode/notes/data/Notes.java
# src/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
# src/src/Notes-master/src/net/micode/notes/data/NotesProvider.java
# src/src/Notes-master/src/net/micode/notes/gtask/data/MetaData.java
# src/src/Notes-master/src/net/micode/notes/gtask/data/Node.java
# src/src/Notes-master/src/net/micode/notes/gtask/data/SqlData.java
# src/src/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java
# src/src/Notes-master/src/net/micode/notes/gtask/data/Task.java
# src/src/Notes-master/src/net/micode/notes/gtask/data/TaskList.java
# src/src/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java
# src/src/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java
# src/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
# src/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java
# src/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java
# src/src/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java
# src/src/Notes-master/src/net/micode/notes/model/Note.java
# src/src/Notes-master/src/net/micode/notes/model/WorkingNote.java
# src/src/Notes-master/src/net/micode/notes/tool/BackupUtils.java
# src/src/Notes-master/src/net/micode/notes/tool/DataUtils.java
# src/src/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java
# src/src/Notes-master/src/net/micode/notes/tool/ResourceParser.java
# src/src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java
# src/src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java
# src/src/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java
# src/src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java
# src/src/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java
# src/src/Notes-master/src/net/micode/notes/ui/DropdownMenu.java
# src/src/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java
# src/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
# src/src/Notes-master/src/net/micode/notes/ui/NoteEditText.java
# src/src/Notes-master/src/net/micode/notes/ui/NoteItemData.java
# src/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java
# src/src/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java
# src/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java
# src/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java
# src/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java
# src/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
# src/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
# src/src/app/build.gradle
# src/src/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
# src/src/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
# src/src/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml
# src/src/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json
# src/src/app/build/intermediates/compatible_screen_manifest/debug/out/output.json
# src/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
# src/src/app/build/intermediates/instant_app_manifest/debug/output.json
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
# src/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
# src/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
# src/src/app/build/intermediates/merged_manifests/debug/output.json
# src/src/app/build/intermediates/metadata_feature_manifest/debug/metadata-feature/output.json
# src/src/app/build/intermediates/navigation_json/debug/navigation.json
# src/src/app/build/intermediates/processed_res/debug/out/output.json
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
# src/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
# src/src/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat
# src/src/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat
# src/src/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat
# src/src/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat
# src/src/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat
# src/src/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat
# src/src/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat
# src/src/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat
# src/src/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat
# src/src/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat
# src/src/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat
# src/src/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat
# src/src/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat
# src/src/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat
# src/src/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat
# src/src/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat
# src/src/app/build/outputs/apk/debug/output-metadata.json
# src/src/app/src/main/res/color/primary_text_dark.xml
# src/src/app/src/main/res/color/secondary_text_dark.xml
# src/src/app/src/main/res/raw-zh-rCN/introduction
# src/src/app/src/main/res/values-zh-rCN/strings.xml
# src/src/app/src/main/res/values/strings.xml
# src/src/build.gradle
# src/src/gradle/wrapper/gradle-wrapper.jar
# src/src/gradle/wrapper/gradle-wrapper.properties
# src/src/gradlew
# src/src/gradlew.bat
# src/src/import-summary.txt
# src/src/local.properties
# src/src/settings.gradle
|
5 years ago |
LWY
|
413551a7b2
|
最终提交
|
5 years ago |
pengboming18
|
cc4b10148b
|
更新代码部分
|
5 years ago |
pengboming18
|
fb876f83ea
|
更新代码部分
|
5 years ago |
pengboming18
|
8d79337b78
|
更新快速获取时间
|
5 years ago |
pengboming18
|
2548aad39b
|
更新手绘便签版本
|
5 years ago |
pengboming18
|
451fe58df6
|
更新测试用例
|
5 years ago |
pengboming18
|
edc3eabea7
|
更新了详细设计内的部分内容
|
5 years ago |
pengboming18
|
5b8695bd6d
|
更新了详细设计
|
5 years ago |
pengboming18
|
b5506d1bb6
|
进行了一些更改
|
5 years ago |
pengboming18
|
13a3b554fe
|
物理视图、逻辑视图、开发试图
|
5 years ago |
pengboming18
|
d396630352
|
软件设计与建模
|
5 years ago |
LWY
|
3237c8e9d3
|
对部分用例描述进行修改
|
5 years ago |
pengboming18
|
b3eb962c88
|
添加软件原型、用例图
|
5 years ago |
ly
|
4a275d7d3e
|
修改
|
5 years ago |
pengboming18
|
74002fda3f
|
去除了多余内容
|
5 years ago |
pengboming18
|
d1e17f630f
|
删减了部分内容
|
5 years ago |
LWY
|
439c8780bd
|
添加了部分功能的用例描述;增加了软件的一般性描述,特别是添加了软件受到的限制与约束;对表格的格式进行了规整。
|
5 years ago |
ly
|
2db568a778
|
完成了用例分析,和做出了一些修改
|
5 years ago |
pengboming18
|
b7f6623ba7
|
软件需求分析
|
5 years ago |
LWY
|
dd270165a8
|
主要是修改需求报告,添加了一些手绘便签的功能,同时插入了比较直观的功能图。
|
5 years ago |
ly
|
674646161e
|
做了一些修改并完成了软件的需求获取和用例描述。
|
5 years ago |
pengboming18
|
ce8d462b1b
|
需求分析
|
5 years ago |
LWY
|
e74311ff7d
|
更新了软件创新点,完善了软件功能,同时对软件实现中可能遇到的问题进行了补充
|
5 years ago |
LWY
|
de9dc16c73
|
对软件功能进行了添加,优化了文档格式,对软件设计的可行性及潜在风险进行了补充
|
5 years ago |
pengboming18
|
0a2b5992ef
|
“膳食平衡小助手”软件设计
|
5 years ago |
LWY
|
29029b4b48
|
更新了可能存在的问题,修订出现的一些文本错误
|
5 years ago |
pengboming18
|
79d7a565e9
|
更新了软件功能表以及潜在风险
|
5 years ago |
ly
|
9aa190bfad
|
人体健康系统大概设计文案。
|
5 years ago |
ly
|
d9a806a912
|
利用SonarQube对小米便签代码进行机器分析
|
5 years ago |
ly
|
7334701d72
|
接续分析
|
5 years ago |
ly
|
bb2d0c9838
|
接续分析
|
5 years ago |
pengboming18
|
98ac95f327
|
增加了三个bug的分析
|
5 years ago |
LWY
|
e1495cc95f
|
质量分析报告
|
5 years ago |
pengboming18
|
f9bbc64d1d
|
2020.10.6
提交泛读报告(小组共同完成)
|
5 years ago |
pengboming18
|
038f352b04
|
init
|
5 years ago |