Merge branch 'main' of https://bdgit.educoder.net/pjmhoeuy7/gitProject into dev
# Conflicts:
# 01src/1.txt
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/data/Contact.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/data/Notes.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/data/NotesDatabaseHelper.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/data/NotesProvider.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/data/MetaData.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/data/Node.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/data/SqlData.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/data/SqlNote.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/data/Task.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/data/TaskList.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/exception/ActionFailureException.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/exception/NetworkFailureException.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/remote/GTaskClient.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/remote/GTaskManager.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/gtask/remote/GTaskSyncService.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/model/Note.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/model/WorkingNote.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/tool/BackupUtils.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/tool/DataUtils.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/tool/GTaskStringUtils.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/tool/ResourceParser.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/AlarmAlertActivity.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/AlarmInitReceiver.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/AlarmReceiver.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/DateTimePicker.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/DateTimePickerDialog.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/DropdownMenu.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/FoldersListAdapter.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/NoteEditActivity.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/NoteEditText.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/NoteItemData.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/NotesListActivity.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/NotesListAdapter.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/NotesListItem.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/ui/NotesPreferenceActivity.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/widget/NoteWidgetProvider.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
# 01src/XiaoMiNotes/MyApplication/app/src/androidTest/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
# 01src/XiaoMiNotes/MyApplication/app/src/main/AndroidManifest.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/color/primary_text_dark.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/color/secondary_text_dark.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/call_record.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/clock.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/delete.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/edit_blue.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/edit_green.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/edit_red.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/edit_title_green.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/edit_title_red.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/edit_title_white.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/edit_white.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/edit_yellow.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/font_large.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/font_normal.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/font_small.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/font_super.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/icon_app.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_background.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_blue_down.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_blue_single.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_blue_up.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_folder.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_green_down.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_green_middle.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_green_single.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_green_up.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_red_down.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_red_middle.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_red_single.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_red_up.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_white_down.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_white_middle.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_white_single.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_white_up.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/menu_delete.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/menu_move.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/new_note_normal.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/new_note_pressed.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/notification.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/search_result.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/selected.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/title_alert.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/widget_2x_blue.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/widget_2x_green.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/widget_2x_red.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/widget_2x_white.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/widget_4x_blue.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/widget_4x_green.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/widget_4x_red.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/widget_4x_white.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/drawable/new_note.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/account_dialog_title.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/add_account_text.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/datetime_picker.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/dialog_edit_text.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/folder_list_item.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/note_edit.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/note_edit_list_item.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/note_item.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/note_list.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/note_list_dropdown_menu.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/note_list_footer.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/settings_header.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/widget_2x.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/layout/widget_4x.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/menu/call_note_edit.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/menu/call_record_folder.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/menu/note_edit.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/menu/note_list.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/menu/note_list_dropdown.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/menu/note_list_options.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/menu/sub_folder.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/raw-zh-rCN/introduction
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/raw/introduction
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/values-zh-rCN/arrays.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/values-zh-rCN/strings.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/values-zh-rTW/arrays.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/values-zh-rTW/strings.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/values/arrays.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/values/colors.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/values/dimens.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/values/strings.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/values/styles.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/xml/preferences.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/xml/searchable.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/xml/widget_2x_info.xml
# 01src/XiaoMiNotes/MyApplication/app/src/main/res/xml/widget_4x_info.xml
# 02model/1.txt
# 03doc/1.txt
# 04other/1.txt
|
吴丽丽
dev
llr