diff --git a/Notes-master2/.gradle/7.5/executionHistory/executionHistory.bin b/Notes-master2/.gradle/7.5/executionHistory/executionHistory.bin index c273d19..a2c7877 100644 Binary files a/Notes-master2/.gradle/7.5/executionHistory/executionHistory.bin and b/Notes-master2/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/Notes-master2/.gradle/7.5/executionHistory/executionHistory.lock b/Notes-master2/.gradle/7.5/executionHistory/executionHistory.lock index eaf9c76..3b216e6 100644 Binary files a/Notes-master2/.gradle/7.5/executionHistory/executionHistory.lock and b/Notes-master2/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/Notes-master2/.gradle/7.5/fileHashes/fileHashes.bin b/Notes-master2/.gradle/7.5/fileHashes/fileHashes.bin index 038859f..f052b00 100644 Binary files a/Notes-master2/.gradle/7.5/fileHashes/fileHashes.bin and b/Notes-master2/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/Notes-master2/.gradle/7.5/fileHashes/fileHashes.lock b/Notes-master2/.gradle/7.5/fileHashes/fileHashes.lock index 1f95353..6eab164 100644 Binary files a/Notes-master2/.gradle/7.5/fileHashes/fileHashes.lock and b/Notes-master2/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/Notes-master2/.gradle/7.5/fileHashes/resourceHashesCache.bin b/Notes-master2/.gradle/7.5/fileHashes/resourceHashesCache.bin index 007c7e0..8703867 100644 Binary files a/Notes-master2/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/Notes-master2/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock index fc1e95f..5761743 100644 Binary files a/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Notes-master2/app/build/intermediates/apk/debug/app-debug.apk b/Notes-master2/app/build/intermediates/apk/debug/app-debug.apk index a7ab97a..6c22098 100644 Binary files a/Notes-master2/app/build/intermediates/apk/debug/app-debug.apk and b/Notes-master2/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index ff7beb0..dd7aa05 100644 Binary files a/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index e04198f..2f61f29 100644 --- a/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/Notes-master2/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,6 +1,6 @@ -#Thu May 11 20:56:47 CST 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +#Thu May 11 21:34:16 CST 2023 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\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\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\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\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat diff --git a/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index fbdc2e7..1b598f0 100644 --- a/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Thu May 11 21:12:56 CST 2023 +#Thu May 11 21:43:04 CST 2023 base.0=D\:\\SoftEngineering\\MiNotesPlusDemo\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 7387766..7129d06 100644 Binary files a/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class index a1d202d..d2c9c6f 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class index a41b775..b7f2623 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class index 029286f..bf9b3b5 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class index e65c35c..4c2187d 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class index de51bad..6f7208c 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class index d04cbe7..e921c47 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 6f10a05..54a8c82 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class index 415e755..3e83448 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 7f6cc71..a40070c 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class index ddd74fd..8b3418f 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class index d805d20..eba667b 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 5baff15..f6cee86 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 383f2f5..f470290 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class index 2040186..fee9869 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 3a1b2fa..9b0397a 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index 771aa91..4db1ca1 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index b0cbbe8..44e54e8 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 38d6632..463d03b 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 3c1262f..779a263 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 7bf348d..508bf49 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index aaab36e..eae5442 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index da867a9..b29783b 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 3d7d04d..a0de907 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index a50607a..b6db9d8 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 2ee1fd8..a2fbdaf 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index 267899f..fd1e9d8 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 407b4f9..016c842 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 9726a09..b30291e 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 3672690..c8cf658 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index d09cec7..55ea004 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index dc77c5e..57899b9 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 37b5776..395cb61 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class index 2bdb58b..11c8cc2 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class index 5e432e9..e37c2f6 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index f5ad7a2..30605b4 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 460c1ca..00ee0c3 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class index 5e57761..8523228 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class index e3404b0..d91bc85 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class index 6c8cdd7..99c7a64 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class index 7cab1be..17e4d3b 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class index af09653..7b80036 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class index bc4a82b..d9abeb9 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class index f937517..39e534a 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 29356de..f2e65a2 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 325cf13..1709e24 100644 Binary files a/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index d1fcb2e..30b52a1 100644 --- a/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,256 +20,257 @@ 20 android:versionName="0.1" > 21 22 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44 23 android:minSdkVersion="14" -23-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:24:15-41 24 android:targetSdkVersion="29" /> -24-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 +24-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44 25 26 -26-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:26:5-81 +26-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:26:22-78 27 -27-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:27:5-88 +27-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:27:22-85 28 -28-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:28:5-67 +28-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:28:22-64 29 -29-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:29:5-72 +29-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:29:22-69 30 -30-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:30:5-74 +30-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:30:22-71 31 -31-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:31:5-80 +31-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:31:22-77 32 -32-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:32:5-71 +32-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:32:22-68 33 -33-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:33:5-74 +33-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:33:22-71 34 -34-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:34:5-81 +34-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:34:22-78 35 36 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:35:5-150:19 +36-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:36:5-151:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:37:9-42 39 android:label="@string/app_name" -39-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:38:9-41 40 android:testOnly="true" > 41 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:38:9-51:20 +41-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:39:9-52:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:40:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:41:13-74 44 android:label="@string/app_name" -44-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:42:13-45 45 android:launchMode="singleTop" -45-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:43:13-43 46 android:theme="@style/NoteTheme" -46-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:43:13-45 +46-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:44:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:44:13-57 +47-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:45:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:45:13-52 +48-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:46:13-52 49 -49-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:47:13-50:29 +49-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:48:13-51:29 50 -50-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:48:25-66 +50-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:17-69 +50-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:25-66 51 52 -52-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:27-74 +52-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:50:17-77 +52-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:50:27-74 53 54 55 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:53:9-81:20 +55-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:54:9-82:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:54:13-48 +56-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:55:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:55:13-74 +57-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:56:13-74 58 android:launchMode="singleTop" -58-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:56:13-43 +58-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:57:13-43 59 android:theme="@style/NoteTheme" > -59-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:57:13-45 -60 -60-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:59:13-64:29 +59-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:58:13-45 +60 +60-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:13-65:29 +60-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:28-49 61 -61-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:25-66 +61-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:17-69 +61-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:25-66 62 63 -63-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73 +63-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-76 +63-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:27-73 64 65 -65-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75 +65-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:17-78 +65-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:23-75 66 -66-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75 +66-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:17-78 +66-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:23-75 67 68 -68-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:66:13-71:29 +68-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:67:13-72:29 69 -69-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:67:25-76 +69-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:68:17-79 +69-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:68:25-76 70 71 -71-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73 +71-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-76 +71-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:27-73 72 73 -73-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75 +73-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:17-78 +73-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:23-75 74 -74-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75 +74-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:17-78 +74-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:23-75 75 76 -76-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:73:13-76:29 +76-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:74:13-77:29 77 -77-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:74:25-68 +77-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:75:17-71 +77-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:75:25-68 78 79 -79-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73 +79-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-76 +79-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:27-73 80 81 82 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:78:13-80:54 +82-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:79:13-81:54 83 android:name="android.app.searchable" -83-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:79:17-54 +83-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:80:17-54 84 android:resource="@xml/searchable" /> -84-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:80:17-51 +84-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:81:17-51 85 86 87 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:83:9-87:43 +87-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:84:9-88:43 88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:84:13-63 +88-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:85:13-63 89 android:authorities="micode_notes" -89-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:85:13-47 +89-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:86:13-47 90 android:exported="true" -90-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:86:13-36 +90-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:87:13-36 91 android:multiprocess="true" /> -91-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:87:13-40 +91-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:88:13-40 92 93 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:89:9-101:20 +93-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:90:9-102:20 94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -94-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:90:13-57 +94-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:91:13-57 95 android:label="@string/app_widget2x2" > -95-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:91:13-50 +95-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:13-50 96 -96-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:13-96:29 +96-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:13-97:29 97 -97-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:17-84 -97-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:25-81 +97-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-84 +97-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-81 98 -98-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82 +98-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85 +98-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82 99 -99-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85 -99-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82 +99-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:17-85 +99-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:25-82 100 101 102 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:98:13-100:58 +102-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:13-101:58 103 android:name="android.appwidget.provider" -103-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:17-58 +103-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-58 104 android:resource="@xml/widget_2x_info" /> -104-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-55 +104-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:101:17-55 105 106 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:102:9-115:20 +106-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:103:9-116:20 107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -107-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:103:13-57 +107-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:104:13-57 108 android:label="@string/app_widget4x4" > -108-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:104:13-50 +108-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:105:13-50 109 -109-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:13-96:29 +109-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:13-97:29 110 -110-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:17-84 -110-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:25-81 +110-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-84 +110-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-81 111 -111-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82 +111-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85 +111-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82 112 -112-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85 -112-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82 +112-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:17-85 +112-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:25-82 113 114 115 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:98:13-100:58 +115-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:13-101:58 116 android:name="android.appwidget.provider" -116-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:17-58 +116-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-58 117 android:resource="@xml/widget_4x_info" /> -117-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-55 +117-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:101:17-55 118 119 -119-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:117:9-121:20 -119-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:117:19-55 +119-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:9-122:20 +119-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:19-55 120 -120-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:13-120:29 +120-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:119:13-121:29 121 -121-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:119:17-79 -121-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:119:25-76 +121-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:120:17-79 +121-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:120:25-76 122 123 124 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:123:9-126:20 +124-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:124:9-127:20 125 android:name="net.micode.notes.ui.AlarmReceiver" -125-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:124:13-61 +125-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:125:13-61 126 android:process=":remote" > -126-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:125:13-38 +126-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:126:13-38 127 128 129 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:128:9-133:20 +129-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:129:9-134:20 130 android:name="net.micode.notes.ui.AlarmAlertActivity" -130-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:129:13-50 +130-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:130:13-50 131 android:label="@string/app_name" -131-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:130:13-45 +131-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:131:13-45 132 android:launchMode="singleInstance" -132-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:131:13-48 +132-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:132:13-48 133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -133-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:132:13-75 +133-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:133:13-75 134 135 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:135:9-140:20 +135-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:136:9-141:20 136 android:name="net.micode.notes.ui.NotesPreferenceActivity" -136-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:136:13-71 +136-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:137:13-71 137 android:label="@string/preferences_title" -137-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:137:13-54 +137-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:138:13-54 138 android:launchMode="singleTop" -138-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:138:13-43 +138-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:139:13-43 139 android:theme="@android:style/Theme.Holo.Light" > -139-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:139:13-60 +139-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:140:13-60 140 141 142 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:142:9-145:19 +142-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:143:9-146:19 143 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -143-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:143:13-74 +143-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:144:13-74 144 android:exported="false" > -144-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:144:13-37 +144-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:145:13-37 145 146 147 D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:147:9-149:52 +147-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:148:9-150:52 148 android:name="android.app.default_searchable" -148-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:148:13-58 +148-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:149:13-58 149 android:value=".ui.NoteEditActivity" /> -149-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:149:13-49 +149-->D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:150:13-49 150 151 152 diff --git a/Notes-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/Notes-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 7968c45..8bf7283 100644 --- a/Notes-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/Notes-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -57,7 +57,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" android:theme="@style/NoteTheme" > - + diff --git a/Notes-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/Notes-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 7968c45..8bf7283 100644 --- a/Notes-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/Notes-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -57,7 +57,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" android:theme="@style/NoteTheme" > - + diff --git a/Notes-master2/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/Notes-master2/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index 817c7a4..d3f2bd8 100644 Binary files a/Notes-master2/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/Notes-master2/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/Notes-master2/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/Notes-master2/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 958759e..c7cbd01 100644 --- a/Notes-master2/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/Notes-master2/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,32 +1,32 @@ [ - { - "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", - "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" - }, { "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" }, { - "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", - "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" + "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", + "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", - "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" + "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", + "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" }, { "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", - "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" + "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", + "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" }, { "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" }, + { + "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", + "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" + }, { "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" @@ -215,22 +215,22 @@ "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" }, - { - "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", - "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml" - }, { "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", - "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" + "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", + "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml" }, { "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" }, + { + "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", + "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" + }, { "merged": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", "source": "D:\\tools\\gradle\\repository\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" diff --git a/Notes-master2/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/Notes-master2/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index 7968c45..8bf7283 100644 --- a/Notes-master2/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/Notes-master2/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -57,7 +57,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" android:theme="@style/NoteTheme" > - + diff --git a/Notes-master2/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/Notes-master2/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 547f6e5..3a94a89 100644 Binary files a/Notes-master2/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/Notes-master2/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex index 04d5c91..98aadee 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex index 64cbaab..a7e6422 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex index b1a976d..249a3e3 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex index 97a7ce4..3641802 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex index 5ff69b8..acad14a 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex index 08f79c9..2198e52 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index bed55b4..652293a 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex index 379d253..2a62919 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index 2e21e00..76bdf01 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex index a355446..b19e605 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex index 7f1ee6d..e0bb9a1 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index 488e040..28ac153 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index a1fad89..8a174e7 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex index 1a6e15e..09dda44 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index f01ae95..b35ee84 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex index 8eba346..8813c88 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index d0411dc..4eda7f0 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index f9d16b5..57c9cce 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index 3f0319a..0ef7098 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index 308abef..0607976 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index cf4b620..9d9f9a8 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 735624a..4c9c0f1 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index d74dfca..f6abdd3 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index d4008f8..f68b81c 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index cf8fa6f..8cc2933 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 4112bf6..8f7737f 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index c7d0ff5..c2c3222 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index d92aaca..79e028e 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 86829de..e132670 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index ba71ac8..55ec660 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index e3fdc48..5fc9845 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index a2e16ed..488b2a5 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex index b2e4069..d983a90 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex index 3456bf5..9c06f52 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 96c56ea..f8a0f25 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 8ba3549..b30d3ed 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex index 12e6bd4..c665855 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex index d29dff9..afc2167 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex index 4f30dce..c75dcff 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex index 409cdbc..5a37d5a 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex index 44d83e6..d79be5e 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex index 8698c55..92aba60 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex index 4207b95..f42000d 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index e986280..5c9036c 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index b9e56d9..fad8994 100644 Binary files a/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/Notes-master2/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/Notes-master2/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 46e1373..83040b8 100644 --- a/Notes-master2/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/Notes-master2/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,133 +1,127 @@ -net.micode.notes:string/ticker_success = 0x7f0a0062 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:string/file_path = 0x7f0a0016 -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:string/note_link_other = 0x7f0a003d -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:id/tv_title_bar = 0x7f050041 -net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:string/ticker_syncing = 0x7f0a0063 -net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 +net.micode.notes:xml/widget_4x_info = 0x7f0c0003 net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:id/iv_bg_white = 0x7f050015 +net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 +net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 +net.micode.notes:string/widget_havenot_content = 0x7f0a0064 +net.micode.notes:string/ticker_syncing = 0x7f0a0063 +net.micode.notes:string/ticker_success = 0x7f0a0062 +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 +net.micode.notes:string/ticker_cancel = 0x7f0a0060 net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:string/sync_progress_init_list = 0x7f0a005d +net.micode.notes:string/search_label = 0x7f0a0058 +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 +net.micode.notes:string/preferences_title = 0x7f0a0053 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:drawable/title_alert = 0x7f040036 -net.micode.notes:id/note_title = 0x7f050035 -net.micode.notes:string/menu_search = 0x7f0a0031 net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d -net.micode.notes:id/menu_search = 0x7f050029 -net.micode.notes:xml/widget_4x_info = 0x7f0c0003 net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:string/preferences_title = 0x7f0a0053 -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:id/notes_list = 0x7f050036 -net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 -net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 +net.micode.notes:string/preferences_account_summary = 0x7f0a0044 +net.micode.notes:string/success_sdcard_export = 0x7f0a005b +net.micode.notes:string/notelist_string_info = 0x7f0a0043 net.micode.notes:string/notelist_menu_new = 0x7f0a0042 -net.micode.notes:string/menu_share = 0x7f0a0037 -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 net.micode.notes:string/notealert_ok = 0x7f0a0041 +net.micode.notes:string/notealert_enter = 0x7f0a0040 net.micode.notes:string/note_link_web = 0x7f0a003f +net.micode.notes:string/note_link_tel = 0x7f0a003e +net.micode.notes:string/note_link_other = 0x7f0a003d +net.micode.notes:string/note_link_email = 0x7f0a003c +net.micode.notes:string/note_alert_expired = 0x7f0a003b +net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 +net.micode.notes:string/menu_sync = 0x7f0a0038 +net.micode.notes:string/menu_share = 0x7f0a0037 +net.micode.notes:string/menu_select_title = 0x7f0a0034 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 +net.micode.notes:string/menu_select_none = 0x7f0a0033 net.micode.notes:string/menu_title_select_folder = 0x7f0a003a net.micode.notes:string/menu_select_all = 0x7f0a0032 -net.micode.notes:string/note_link_email = 0x7f0a003c +net.micode.notes:string/menu_search = 0x7f0a0031 +net.micode.notes:string/menu_remove_remind = 0x7f0a0030 +net.micode.notes:string/menu_normal_mode = 0x7f0a002f net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e -net.micode.notes:string/notelist_string_info = 0x7f0a0043 -net.micode.notes:string/success_sdcard_export = 0x7f0a005b -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/list_green_up = 0x7f040020 net.micode.notes:string/menu_move = 0x7f0a002d -net.micode.notes:menu/note_edit = 0x7f070002 net.micode.notes:string/menu_list_mode = 0x7f0a002c -net.micode.notes:id/iv_bg_blue_select = 0x7f050010 -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c net.micode.notes:string/menu_font_super = 0x7f0a002b +net.micode.notes:string/menu_font_small = 0x7f0a002a +net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 +net.micode.notes:string/menu_export_text = 0x7f0a0023 net.micode.notes:string/menu_deselect_all = 0x7f0a0022 net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:id/menu_share = 0x7f05002c -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:string/menu_select_none = 0x7f0a0033 -net.micode.notes:string/hint_foler_name = 0x7f0a001d -net.micode.notes:string/folder_exist = 0x7f0a0017 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 -net.micode.notes:id/menu_send_to_desktop = 0x7f05002a +net.micode.notes:string/folder_exist = 0x7f0a0017 +net.micode.notes:string/hint_foler_name = 0x7f0a001d net.micode.notes:string/format_date_ymd = 0x7f0a0018 +net.micode.notes:string/file_path = 0x7f0a0016 net.micode.notes:string/set_remind_time_message = 0x7f0a005a net.micode.notes:string/error_sync_network = 0x7f0a0013 net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 +net.micode.notes:drawable/list_green_up = 0x7f040020 +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 net.micode.notes:drawable/new_note_normal = 0x7f040030 net.micode.notes:string/button_delete = 0x7f0a0007 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:raw/introduction = 0x7f090000 -net.micode.notes:string/format_exported_file_location = 0x7f0a001a net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:layout/datetime_picker = 0x7f060002 -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 -net.micode.notes:string/notealert_enter = 0x7f0a0040 -net.micode.notes:id/sv_note_edit = 0x7f05003a -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 +net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:raw/introduction = 0x7f090000 +net.micode.notes:string/delete_remind_time_message = 0x7f0a000b net.micode.notes:dimen/text_font_size_super = 0x7f030004 -net.micode.notes:plurals/search_results_title = 0x7f080000 net.micode.notes:drawable/selected = 0x7f040035 -net.micode.notes:string/delete_remind_time_message = 0x7f0a000b -net.micode.notes:layout/widget_4x = 0x7f06000d -net.micode.notes:id/et_foler_name = 0x7f05000b -net.micode.notes:drawable/edit_green = 0x7f040007 -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 -net.micode.notes:id/iv_bg_blue = 0x7f05000f -net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:drawable/new_note_pressed = 0x7f040031 -net.micode.notes:id/iv_bg_yellow_select = 0x7f050018 +net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 +net.micode.notes:color/secondary_text_dark = 0x7f020001 net.micode.notes:id/move = 0x7f05002f +net.micode.notes:id/iv_bg_yellow_select = 0x7f050018 net.micode.notes:menu/call_note_edit = 0x7f070000 -net.micode.notes:color/secondary_text_dark = 0x7f020001 -net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 +net.micode.notes:drawable/new_note_pressed = 0x7f040031 +net.micode.notes:id/iv_bg_blue = 0x7f05000f +net.micode.notes:layout/settings_header = 0x7f06000b +net.micode.notes:layout/note_list = 0x7f060008 net.micode.notes:drawable/list_white_single = 0x7f040027 net.micode.notes:layout/note_item = 0x7f060007 -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:id/widget_text = 0x7f050043 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 +net.micode.notes:layout/datetime_picker = 0x7f060002 net.micode.notes:id/btn_new_note = 0x7f050005 net.micode.notes:layout/note_list_footer = 0x7f06000a +net.micode.notes:id/widget_text = 0x7f050043 +net.micode.notes:id/tv_title_bar = 0x7f050041 net.micode.notes:drawable/widget_2x_blue = 0x7f040038 net.micode.notes:id/tv_time = 0x7f05003f net.micode.notes:id/tv_name = 0x7f05003e +net.micode.notes:drawable/new_note = 0x7f04002f +net.micode.notes:id/sv_note_edit = 0x7f05003a net.micode.notes:string/error_sdcard_export = 0x7f0a000f net.micode.notes:id/preference_sync_button = 0x7f050038 -net.micode.notes:id/note_edit_view = 0x7f050033 +net.micode.notes:layout/note_edit = 0x7f060005 +net.micode.notes:id/notes_list = 0x7f050036 +net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 +net.micode.notes:drawable/title_alert = 0x7f040036 +net.micode.notes:id/note_title = 0x7f050035 net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f +net.micode.notes:id/note_edit_view = 0x7f050033 net.micode.notes:id/navigation_bar = 0x7f050030 net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:id/minute = 0x7f05002e net.micode.notes:drawable/font_normal = 0x7f040011 +net.micode.notes:id/minute = 0x7f05002e net.micode.notes:drawable/font_super = 0x7f040014 net.micode.notes:id/menu_sync = 0x7f05002d +net.micode.notes:id/menu_share = 0x7f05002c net.micode.notes:id/menu_setting = 0x7f05002b +net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 +net.micode.notes:id/menu_send_to_desktop = 0x7f05002a +net.micode.notes:id/menu_search = 0x7f050029 net.micode.notes:drawable/list_green_down = 0x7f04001d net.micode.notes:id/menu_new_note = 0x7f050028 net.micode.notes:string/error_note_not_exist = 0x7f0a000e @@ -137,14 +131,14 @@ net.micode.notes:id/iv_medium_select = 0x7f05001a net.micode.notes:id/menu_export_text = 0x7f050024 net.micode.notes:string/menu_folder_view = 0x7f0a0026 net.micode.notes:id/menu_delete = 0x7f050022 -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 net.micode.notes:string/ticker_fail = 0x7f0a0061 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050037 +net.micode.notes:string/file_name_txt_format = 0x7f0a0015 net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:id/menu_alert = 0x7f050021 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050037 net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:drawable/edit_title_yellow = 0x7f04000d net.micode.notes:string/menu_alert = 0x7f0a001f +net.micode.notes:drawable/edit_title_yellow = 0x7f04000d +net.micode.notes:id/menu_alert = 0x7f050021 net.micode.notes:string/success_sync_account = 0x7f0a005c net.micode.notes:id/ll_font_super = 0x7f050020 net.micode.notes:id/ll_font_small = 0x7f05001f @@ -152,44 +146,50 @@ net.micode.notes:menu/call_record_folder = 0x7f070001 net.micode.notes:id/ll_font_normal = 0x7f05001e net.micode.notes:id/ll_font_large = 0x7f05001d net.micode.notes:id/note_bg_color_selector = 0x7f050031 -net.micode.notes:id/iv_super_select = 0x7f05001c net.micode.notes:drawable/search_result = 0x7f040034 +net.micode.notes:id/iv_super_select = 0x7f05001c net.micode.notes:id/iv_bg_yellow = 0x7f050017 -net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 net.micode.notes:id/iv_bg_white_select = 0x7f050016 -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c -net.micode.notes:drawable/widget_2x_red = 0x7f04003a +net.micode.notes:id/iv_bg_white = 0x7f050015 net.micode.notes:id/tv_alert_date = 0x7f05003b net.micode.notes:dimen/text_font_size_large = 0x7f030000 net.micode.notes:drawable/notification = 0x7f040033 net.micode.notes:id/iv_bg_red = 0x7f050013 -net.micode.notes:id/iv_large_select = 0x7f050019 net.micode.notes:string/menu_font_large = 0x7f0a0027 net.micode.notes:drawable/widget_4x_blue = 0x7f04003d -net.micode.notes:id/iv_bg_green_select = 0x7f050012 +net.micode.notes:id/iv_large_select = 0x7f050019 net.micode.notes:id/widget_bg_image = 0x7f050042 +net.micode.notes:id/iv_bg_green_select = 0x7f050012 +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a net.micode.notes:drawable/menu_move = 0x7f04002e net.micode.notes:drawable/widget_4x_white = 0x7f040040 -net.micode.notes:id/font_size_selector = 0x7f05000c +net.micode.notes:id/iv_bg_blue_select = 0x7f050010 net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c +net.micode.notes:id/font_size_selector = 0x7f05000c net.micode.notes:id/et_edit_text = 0x7f05000a +net.micode.notes:id/et_foler_name = 0x7f05000b +net.micode.notes:drawable/edit_green = 0x7f040007 +net.micode.notes:layout/widget_4x = 0x7f06000d net.micode.notes:string/search = 0x7f0a0056 net.micode.notes:id/cb_edit_item = 0x7f050007 net.micode.notes:id/btn_set_bg_color = 0x7f050006 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:id/amPm = 0x7f050004 net.micode.notes:id/iv_bg_green = 0x7f050011 +net.micode.notes:id/amPm = 0x7f050004 net.micode.notes:drawable/widget_4x_green = 0x7f04003e +net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:id/hour = 0x7f05000d net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 -net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c +net.micode.notes:drawable/widget_2x_red = 0x7f04003a net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a net.micode.notes:id/delete = 0x7f050009 +net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:drawable/title_bar_bg = 0x7f040037 net.micode.notes:drawable/menu_delete = 0x7f04002d net.micode.notes:string/error_sync_internal = 0x7f0a0012 diff --git a/Notes-master2/app/build/outputs/logs/manifest-merger-debug-report.txt b/Notes-master2/app/build/outputs/logs/manifest-merger-debug-report.txt index dbecc6c..9564184 100644 --- a/Notes-master2/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/Notes-master2/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,237 +1,243 @@ -- Merging decision tree log --- manifest -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-151:12 -INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-151:12 -INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-151:12 -INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-151:12 -INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-151:12 -INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-151:12 -INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-151:12 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:1-152:12 package - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:19:5-31 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:20:5-31 INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:21:5-30 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:22:5-30 INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml + xmlns:tools + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:19:5-51 xmlns:android ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:20:5-28 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:21:5-28 INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44 android:targetSdkVersion INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:24:5-44 INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:23:15-41 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:24:15-41 INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml INJECTED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:26:5-81 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:26:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:27:5-88 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:27:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:28:5-67 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:28:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:29:5-72 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:29:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:30:5-74 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:30:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:31:5-80 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:31:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:32:5-71 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:32:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:33:5-74 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:33:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:34:5-81 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:34:22-78 application -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:35:5-150:19 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:36:5-151:19 android:label - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:38:9-41 android:icon - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:37:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:39:9-52:20 android:label - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:42:13-45 android:launchMode - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:43:13-43 android:windowSoftInputMode - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:45:13-52 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:46:13-52 android:uiOptions - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:44:13-57 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:45:13-57 android:configChanges - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:41:13-74 android:theme - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:44:13-45 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:40:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:48:13-51:29 action#android.intent.action.MAIN -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:17-69 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:50:17-77 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:50:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:54:9-82:20 android:launchMode - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:57:13-43 android:configChanges - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:56:13-74 android:theme - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:58:13-45 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:55:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:13-65:29 + android:scheme + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:28-49 + tools:ignore + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:50-80 action#android.intent.action.VIEW -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:17-69 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:25-66 category#android.intent.category.DEFAULT -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-76 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:27-73 data -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:17-78 android:mimeType - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:63:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:67:13-72:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:68:17-79 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:68:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:74:13-77:29 action#android.intent.action.SEARCH -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:75:17-71 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:75:25-68 meta-data#android.app.searchable -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:79:13-81:54 android:resource - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:81:17-51 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:80:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:83:9-87:43 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:84:9-88:43 android:authorities - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:86:13-47 android:multiprocess - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:87:13-40 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:88:13-40 android:exported - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:86:13-36 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:87:13-36 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:85:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:89:9-101:20 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:90:9-102:20 android:label - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:91:13-50 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:13-50 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:90:13-57 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:91:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:92:13-96:29 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:13-97:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:17-84 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-84 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:93:25-81 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85 - android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:17-85 android:name ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:95:25-82 +action#android.intent.action.PRIVACY_MODE_CHANGED +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:17-85 + android:name + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:96:25-82 meta-data#android.appwidget.provider -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:98:13-100:58 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:13-101:58 android:resource - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-55 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:101:17-55 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:99:17-58 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:100:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:102:9-115:20 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:103:9-116:20 android:label - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:104:13-50 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:105:13-50 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:103:13-57 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:104:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:117:9-121:20 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:9-122:20 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:117:19-55 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:118:13-120:29 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:119:13-121:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:119:17-79 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:120:17-79 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:119:25-76 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:120:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:123:9-126:20 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:124:9-127:20 android:process - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:125:13-38 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:126:13-38 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:124:13-61 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:125:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:128:9-133:20 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:129:9-134:20 android:label - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:130:13-45 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:131:13-45 android:launchMode - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:131:13-48 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:132:13-48 android:theme - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:132:13-75 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:133:13-75 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:129:13-50 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:130:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:135:9-140:20 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:136:9-141:20 android:label - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:137:13-54 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:138:13-54 android:launchMode - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:138:13-43 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:139:13-43 android:theme - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:139:13-60 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:140:13-60 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:136:13-71 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:137:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:142:9-145:19 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:143:9-146:19 android:exported - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:144:13-37 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:145:13-37 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:143:13-74 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:144:13-74 meta-data#android.app.default_searchable -ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:147:9-149:52 +ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:148:9-150:52 android:value - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:149:13-49 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:150:13-49 android:name - ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:148:13-58 + ADDED from D:\SoftEngineering\MiNotesPlusDemo\Notes-master2\app\src\main\AndroidManifest.xml:149:13-58 diff --git a/Notes-master2/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/Notes-master2/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 4269722..a8c326a 100644 Binary files a/Notes-master2/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/Notes-master2/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/Notes-master2/app/src/main/AndroidManifest.xml b/Notes-master2/app/src/main/AndroidManifest.xml index f84b4a3..383f684 100644 --- a/Notes-master2/app/src/main/AndroidManifest.xml +++ b/Notes-master2/app/src/main/AndroidManifest.xml @@ -16,6 +16,7 @@ --> @@ -56,7 +57,7 @@ android:launchMode="singleTop" android:theme="@style/NoteTheme" > - + diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java index f221202..d5b8b6b 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java @@ -31,23 +31,29 @@ import net.micode.notes.data.Notes.NoteColumns; public class AlarmInitReceiver extends BroadcastReceiver { private static final String [] PROJECTION = new String [] { - NoteColumns.ID, - NoteColumns.ALERTED_DATE + NoteColumns.ID, + NoteColumns.ALERTED_DATE }; - + //对数据库的操作，调用标签ID和闹钟时间 private static final int COLUMN_ID = 0; private static final int COLUMN_ALERTED_DATE = 1; @Override public void onReceive(Context context, Intent intent) { + //生成时间戳 自1970年1月1日0时起 long currentDate = System.currentTimeMillis(); + //Cursor在这里的作用是通过查找数据库中的标签内容，找到和当前系统时间相等的标签 Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI, PROJECTION, NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE, + //将long变量currentDate转化为字符串 new String[] { String.valueOf(currentDate) }, null); if (c != null) { + //然而通过网上查找资料发现，对于闹钟机制的启动，通常需要下面的几个步骤 + //如新建Intent、PendingIntent以及AlarmManager等 + //这里就是根据数据库里的闹钟时间创建一个闹钟机制 if (c.moveToFirst()) { do { long alertDate = c.getLong(COLUMN_ALERTED_DATE); @@ -60,6 +66,7 @@ public class AlarmInitReceiver extends BroadcastReceiver { } while (c.moveToNext()); } c.close(); + } } } diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java index 54e503b..27439c2 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java @@ -23,7 +23,10 @@ import android.content.Intent; public class AlarmReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { + //启动AlarmAlertActivit intent.setClass(context, AlarmAlertActivity.class); + //activity要存在于activity的栈中，而 非activity的途径启动activity时必然不存在一个activity的栈 + //所以要新起一个栈装入启动的activity intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(intent); } diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java index 496b0cd..f9bd857 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java @@ -28,8 +28,10 @@ import android.view.View; import android.widget.FrameLayout; import android.widget.NumberPicker; +//FrameLayout是布局模板之一 +//所有的子元素全部在屏幕的右上方 public class DateTimePicker extends FrameLayout { - + ////初始化控件 private static final boolean DEFAULT_ENABLE_STATE = true; private static final int HOURS_IN_HALF_DAY = 12; @@ -45,11 +47,13 @@ public class DateTimePicker extends FrameLayout { private static final int MINUT_SPINNER_MAX_VAL = 59; private static final int AMPM_SPINNER_MIN_VAL = 0; private static final int AMPM_SPINNER_MAX_VAL = 1; - + //NumberPicker是数字选择器 + //这里定义的四个变量全部是在设置闹钟时需要选择的变量（如日期、时、分、上午或者下午） private final NumberPicker mDateSpinner; private final NumberPicker mHourSpinner; private final NumberPicker mMinuteSpinner; private final NumberPicker mAmPmSpinner; + //操作时间 private Calendar mDate; private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; @@ -60,51 +64,66 @@ public class DateTimePicker extends FrameLayout { private boolean mIsEnabled = DEFAULT_ENABLE_STATE; + //初始化标志 private boolean mInitialising; private OnDateTimeChangedListener mOnDateTimeChangedListener; - + //OnValueChangeListener，这是时间改变监听器，这里主要是对日期的监听 private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() { @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal); + //将现在日期的值传递给mDate；updateDateControl是同步操作 updateDateControl(); + // onDateTimeChanged(); } }; + //对小时进行监听 private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() { @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { boolean isDateChanged = false; + Calendar cal = Calendar.getInstance(); - if (!mIs24HourView) { +// //对小时取法的判断 + if (!mIs24HourView) {//12小时进制 + //晚上11点到12点的切换对日期的更改 if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); isDateChanged = true; - } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { + } + //凌晨11点到12点的切换对日期的更改 + else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -1); isDateChanged = true; } + //这里是对于12小时制时，中午11点和12点交替时对AM和PM的更改 if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY || oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { mIsAm = !mIsAm; updateAmPmControl(); } - } else { + } else {//24进制转换 + //这里是对于24小时制时，晚上11点和12点交替时对日期的更改 if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); isDateChanged = true; - } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) { + } + //这里是对于12小时制时，凌晨11点和12点交替时对日期的更改 + else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -1); isDateChanged = true; } } + //通过数字选择器对newHour的赋值 int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY); + //通过set函数将新的Hour值传给mDate mDate.set(Calendar.HOUR_OF_DAY, newHour); onDateTimeChanged(); if (isDateChanged) { @@ -115,11 +134,13 @@ public class DateTimePicker extends FrameLayout { } }; + //对分钟的监听 private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() { @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { int minValue = mMinuteSpinner.getMinValue(); int maxValue = mMinuteSpinner.getMaxValue(); + //对小时改变的记录 int offset = 0; if (oldVal == maxValue && newVal == minValue) { offset += 1; @@ -143,7 +164,7 @@ public class DateTimePicker extends FrameLayout { onDateTimeChanged(); } }; - + //对AM和PM监听 private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() { @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { @@ -160,19 +181,26 @@ public class DateTimePicker extends FrameLayout { public interface OnDateTimeChangedListener { void onDateTimeChanged(DateTimePicker view, int year, int month, - int dayOfMonth, int hourOfDay, int minute); + int dayOfMonth, int hourOfDay, int minute); } + //通过对数据库的访问，获取当前的系统时间 public DateTimePicker(Context context) { this(context, System.currentTimeMillis()); } + //上面函数的得到的是一个天文数字（1970至今的秒数），需要DateFormat将其变得有意义 + //获得时间戳 public DateTimePicker(Context context, long date) { this(context, date, DateFormat.is24HourFormat(context)); } - + //初始化 public DateTimePicker(Context context, long date, boolean is24HourView) { + //获得系统时间 super(context); + //如果当前Activity里用到别的layout，比如对话框layout + //还要设置这个layout上的其他组件的内容，就必须用inflate()方法先将对话框的layout找出来 + //然后再用findViewById()找到它上面的其它组件 mDate = Calendar.getInstance(); mInitialising = true; mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY; @@ -246,6 +274,7 @@ public class DateTimePicker extends FrameLayout { * * @param date The current date in millis */ + //设置当前时间 date 根据时间戳 public void setCurrentDate(long date) { Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(date); @@ -262,8 +291,9 @@ public class DateTimePicker extends FrameLayout { * @param hourOfDay The current hourOfDay * @param minute The current minute */ + //设置当前时间 通过年月日-时分秒 public void setCurrentDate(int year, int month, - int dayOfMonth, int hourOfDay, int minute) { + int dayOfMonth, int hourOfDay, int minute) { setCurrentYear(year); setCurrentMonth(month); setCurrentDay(dayOfMonth); @@ -276,6 +306,7 @@ public class DateTimePicker extends FrameLayout { * * @return The current year */ + //得到年份 public int getCurrentYear() { return mDate.get(Calendar.YEAR); } @@ -285,6 +316,7 @@ public class DateTimePicker extends FrameLayout { * * @param year The current year */ + //设置年份 public void setCurrentYear(int year) { if (!mInitialising && year == getCurrentYear()) { return; @@ -299,6 +331,7 @@ public class DateTimePicker extends FrameLayout { * * @return The current month in the year */ + //得到当前月份 public int getCurrentMonth() { return mDate.get(Calendar.MONTH); } @@ -308,6 +341,7 @@ public class DateTimePicker extends FrameLayout { * * @param month The month in the year */ + //设置月份 public void setCurrentMonth(int month) { if (!mInitialising && month == getCurrentMonth()) { return; @@ -322,6 +356,7 @@ public class DateTimePicker extends FrameLayout { * * @return The day of the month */ + //得到日期 public int getCurrentDay() { return mDate.get(Calendar.DAY_OF_MONTH); } @@ -331,6 +366,7 @@ public class DateTimePicker extends FrameLayout { * * @param dayOfMonth The day of the month */ + //设置日期 public void setCurrentDay(int dayOfMonth) { if (!mInitialising && dayOfMonth == getCurrentDay()) { return; @@ -433,7 +469,7 @@ public class DateTimePicker extends FrameLayout { setCurrentHour(hour); updateAmPmControl(); } - + // 对于星期几的算法 private void updateDateControl() { Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(mDate.getTimeInMillis()); @@ -447,7 +483,7 @@ public class DateTimePicker extends FrameLayout { mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2); mDateSpinner.invalidate(); } - + //对AM PM的算法 private void updateAmPmControl() { if (mIs24HourView) { mAmPmSpinner.setVisibility(View.GONE); @@ -457,7 +493,7 @@ public class DateTimePicker extends FrameLayout { mAmPmSpinner.setVisibility(View.VISIBLE); } } - + //对小时算法 private void updateHourControl() { if (mIs24HourView) { mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW); diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java index 2c47ba4..62696ef 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java @@ -31,22 +31,34 @@ import android.text.format.DateUtils; public class DateTimePickerDialog extends AlertDialog implements OnClickListener { + //创建一个Calendar类型的变量 mDate，方便时间的操作 private Calendar mDate = Calendar.getInstance(); + + private boolean mIs24HourView; + + //声明一个时间日期滚动选择控件 mOnDateTimeSetListener private OnDateTimeSetListener mOnDateTimeSetListener; + + //DateTimePicker控件，控件一般用于让用户可以从日期列表中选择单个值。 + //运行时，单击控件边上的下拉箭头，会显示为两个部分：一个下拉列表，一个用于选择日期的 private DateTimePicker mDateTimePicker; public interface OnDateTimeSetListener { void OnDateTimeSet(AlertDialog dialog, long date); } + //对界面对话框的实例化 public DateTimePickerDialog(Context context, long date) { + //对数据库操作 super(context); mDateTimePicker = new DateTimePicker(context); + //添加一个子视图 setView(mDateTimePicker); + //将视图中的各选项设置为系统当前时间 mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() { public void onDateTimeChanged(DateTimePicker view, int year, int month, - int dayOfMonth, int hourOfDay, int minute) { + int dayOfMonth, int hourOfDay, int minute) { mDate.set(Calendar.YEAR, year); mDate.set(Calendar.MONTH, month); mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth); @@ -55,11 +67,15 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener updateTitle(mDate.getTimeInMillis()); } }); + //设置系统时间 时间戳 mDate.setTimeInMillis(date); + //将秒数设置为0 mDate.set(Calendar.SECOND, 0); mDateTimePicker.setCurrentDate(mDate.getTimeInMillis()); + //设置按钮 setButton(context.getString(R.string.datetime_dialog_ok), this); setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null); + //时间标准化打印 set24HourView(DateFormat.is24HourFormat(this.getContext())); updateTitle(mDate.getTimeInMillis()); } @@ -68,20 +84,25 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener mIs24HourView = is24HourView; } + //将时间日期滚动选择控件实例化 public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) { mOnDateTimeSetListener = callBack; } + //—DateUtils：按照上下午显示时间 private void updateTitle(long date) { int flag = - DateUtils.FORMAT_SHOW_YEAR | - DateUtils.FORMAT_SHOW_DATE | - DateUtils.FORMAT_SHOW_TIME; + DateUtils.FORMAT_SHOW_YEAR | + DateUtils.FORMAT_SHOW_DATE | + DateUtils.FORMAT_SHOW_TIME; flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); } + //按钮监听 public void onClick(DialogInterface arg0, int arg1) { + //第一个参数arg0是接收到点击事件的对话框 + //第二个参数arg1是该对话框上的按钮 if (mOnDateTimeSetListener != null) { mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis()); } diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java index 613dc74..2ac5ad8 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java @@ -30,13 +30,18 @@ import net.micode.notes.R; public class DropdownMenu { private Button mButton; private PopupMenu mPopupMenu; + + //声明一个下拉菜单 private Menu mMenu; public DropdownMenu(Context context, Button button, int menuId) { mButton = button; + //设置view的背景 mButton.setBackgroundResource(R.drawable.dropdown_icon); mPopupMenu = new PopupMenu(context, mButton); mMenu = mPopupMenu.getMenu(); + //MenuInflater是用来实例化Menu目录下的Menu布局文件 + //根据ID来确认menu的内容选项 mPopupMenu.getMenuInflater().inflate(menuId, mMenu); mButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { @@ -45,6 +50,7 @@ public class DropdownMenu { }); } + //设置菜单监听 public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) { if (mPopupMenu != null) { mPopupMenu.setOnMenuItemClickListener(listener); @@ -55,6 +61,7 @@ public class DropdownMenu { return mMenu.findItem(id); } + //布局文件，设置标题 public void setTitle(CharSequence title) { mButton.setText(title); } diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java index b6867fb..e89e769 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package net.micode.notes.ui; import android.content.Context; @@ -12,31 +28,34 @@ import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; - +//CursorAdapter是Cursor和ListView的接口 +//FoldersListAdapter继承了CursorAdapter的类 +//主要作用是便签数据库和用户的交互 +//这里就是用folder（文件夹）的形式展现给用户 public class FoldersListAdapter extends CursorAdapter { - //CursorAdapter是Cursor和ListView的接口 - //FoldersListAdapter继承了CursorAdapter的类 - //主要作用是便签数据库和用户的交互 - //这里就是用folder（文件夹）的形式展现给用户 + //调用数据库中便签的ID和片段 public static final String [] PROJECTION = { NoteColumns.ID, NoteColumns.SNIPPET - };//调用数据库中便签的ID和片段 + }; public static final int ID_COLUMN = 0; public static final int NAME_COLUMN = 1; + //数据库操作 public FoldersListAdapter(Context context, Cursor c) { super(context, c); // TODO Auto-generated constructor stub - }//数据库操作 + } + //创建一个文件夹，对于各文件夹中子标签的初始化 @Override + //ViewGroup是容器 public View newView(Context context, Cursor cursor, ViewGroup parent) { - //ViewGroup是容器 return new FolderListItem(context); - }//创建一个文件夹，对于各文件夹中子标签的初始化 + } + //将各个布局文件绑定起来 @Override public void bindView(View view, Context context, Cursor cursor) { if (view instanceof FolderListItem) { @@ -44,22 +63,23 @@ public class FoldersListAdapter extends CursorAdapter { .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); ((FolderListItem) view).bind(folderName); } - }//将各个布局文件绑定起来 + } + //根据数据库中标签的ID得到标签的各项内容 public String getFolderName(Context context, int position) { Cursor cursor = (Cursor) getItem(position); return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); - }//根据数据库中标签的ID得到标签的各项内容 + } private class FolderListItem extends LinearLayout { private TextView mName; public FolderListItem(Context context) { - super(context); //操作数据库 - inflate(context, R.layout.folder_list_item, this); + super(context); //根据布局文件的名字等信息将其找出来 + inflate(context, R.layout.folder_list_item, this); mName = (TextView) findViewById(R.id.tv_folder_name); } @@ -68,4 +88,4 @@ public class FoldersListAdapter extends CursorAdapter { } } -} \ No newline at end of file +} diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditText.java index 2afe2a8..c68eff2 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditText.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditText.java @@ -37,6 +37,8 @@ import net.micode.notes.R; import java.util.HashMap; import java.util.Map; + +//继承edittext，设置便签设置文本框 public class NoteEditText extends EditText { private static final String TAG = "NoteEditText"; private int mIndex; @@ -46,6 +48,9 @@ public class NoteEditText extends EditText { private static final String SCHEME_HTTP = "http:" ; private static final String SCHEME_EMAIL = "mailto:" ; + + ///建立一个字符和整数的hash表，用于链接电话，网站，还有邮箱 + private static final Map sSchemaActionResMap = new HashMap(); static { sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel); @@ -56,40 +61,50 @@ public class NoteEditText extends EditText { /** * Call by the {@link NoteEditActivity} to delete or add edit text */ + //在NoteEditActivity中删除或添加文本的操作，可以看做是一个文本是否被变的标记 public interface OnTextViewChangeListener { /** * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens * and the text is null */ + //处理删除按键时的操作 void onEditTextDelete(int index, String text); /** * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER} * happen */ + //处理删除按键时的操作 void onEditTextEnter(int index, String text); /** * Hide or show item option when text change */ + //处理文本改变时的操作 void onTextChange(int index, boolean hasText); } private OnTextViewChangeListener mOnTextViewChangeListener; + + //根据context设置文本 public NoteEditText(Context context) { - super(context, null); + super(context, null);//用super引用父类变量 mIndex = 0; } + //设置当前光标 public void setIndex(int index) { mIndex = index; } + //初始化文本修改标记 进行mOnTextViewChangeListener的初始化 public void setOnTextViewChangeListener(OnTextViewChangeListener listener) { mOnTextViewChangeListener = listener; } + //初始化便签 + //AttributeSet 百度了一下是自定义空控件属性，用于维护便签动态变化的属性 public NoteEditText(Context context, AttributeSet attrs) { super(context, attrs, android.R.attr.editTextStyle); } @@ -99,21 +114,26 @@ public class NoteEditText extends EditText { // TODO Auto-generated constructor stub } + //处理屏幕所有事件 + /*参数event为手机屏幕触摸事件封装类的对象，其中封装了该事件的所有信息， + 例如触摸的位置、触摸的类型以及触摸的时间等。该对象会在用户触摸手机屏幕时被创建。*/ @Override public boolean onTouchEvent(MotionEvent event) { + //重写了需要处理屏幕被按下的事件 switch (event.getAction()) { case MotionEvent.ACTION_DOWN: - + //获得当前位置 int x = (int) event.getX(); int y = (int) event.getY(); x -= getTotalPaddingLeft(); y -= getTotalPaddingTop(); x += getScrollX(); y += getScrollY(); - + //根据x,y设置layout的位置 Layout layout = getLayout(); int line = layout.getLineForVertical(y); int off = layout.getOffsetForHorizontal(line, x); + //更新光标新的位置 Selection.setSelection(getText(), off); break; } @@ -121,97 +141,137 @@ public class NoteEditText extends EditText { return super.onTouchEvent(event); } + //键盘按下事件处理 @Override public boolean onKeyDown(int keyCode, KeyEvent event) { + //根据Unicode编码值处理 switch (keyCode) { + //”进入“按键处理 case KeyEvent.KEYCODE_ENTER: if (mOnTextViewChangeListener != null) { return false; } break; + //"删除"按键处理 case KeyEvent.KEYCODE_DEL: mSelectionStartBeforeDelete = getSelectionStart(); break; default: break; } + //处理父类的事件 return super.onKeyDown(keyCode, event); } + //按键松开事件触发 @Override public boolean onKeyUp(int keyCode, KeyEvent event) { + //同样使用Unicode编码处理 switch(keyCode) { case KeyEvent.KEYCODE_DEL: + //如果被修改过 if (mOnTextViewChangeListener != null) { + //如果文档不为空 if (0 == mSelectionStartBeforeDelete && mIndex != 0) { + //利用上文OnTextViewChangeListener对KEYCODE_DEL按键情况的删除函数进行删除 mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString()); return true; } } else { + + //其他情况报错，文档的改动监听器并没有建立 Log.d(TAG, "OnTextViewChangeListener was not seted"); } break; case KeyEvent.KEYCODE_ENTER: - if (mOnTextViewChangeListener != null) { + //同上也是分为监听器是否建立2种情况 + if (mOnTextViewChangeListener != null) {//不为空 + //获得位置 int selectionStart = getSelectionStart(); + //获得当前文本 String text = getText().subSequence(selectionStart, length()).toString(); + //根据获取的文本设置当前文本 setText(getText().subSequence(0, selectionStart)); mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text); } else { + //没建立时报错 Log.d(TAG, "OnTextViewChangeListener was not seted"); } break; default: break; } + //调用父类方法 return super.onKeyUp(keyCode, event); } + + //函数功能：当焦点发生变化时，会自动调用该方法来处理焦点改变的事件 + /* + 参数：focused表示触发该事件的View是否获得了焦点，当该控件获得焦点时，Focused等于true，否则等于false。 + direction表示焦点移动的方向，用数值表示 + Rect：表示在触发事件的View的坐标系中，前一个获得焦点的矩形区域，即表示焦点是从哪里来的。如果不可用则为null + */ @Override protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) { + //监听是否建立 if (mOnTextViewChangeListener != null) { + if (!focused && TextUtils.isEmpty(getText())) { + //mOnTextViewChangeListener子函数，置false隐藏事件选项 mOnTextViewChangeListener.onTextChange(mIndex, false); - } else { + } else {//获取到焦点并且文本不为空 + //mOnTextViewChangeListener子函数，置true显示事件选项 mOnTextViewChangeListener.onTextChange(mIndex, true); } } + //调用父类的方法 super.onFocusChanged(focused, direction, previouslyFocusedRect); } + //创建上下文菜单 @Override protected void onCreateContextMenu(ContextMenu menu) { - if (getText() instanceof Spanned) { + if (getText() instanceof Spanned) { //判断文本存在 + //获取文本开始和结尾位置 int selStart = getSelectionStart(); int selEnd = getSelectionEnd(); - + ////获取开始到结尾的最大值和最小值 int min = Math.min(selStart, selEnd); int max = Math.max(selStart, selEnd); + //设置url的信息的范围值 final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class); + //创建成功 if (urls.length == 1) { int defaultResId = 0; + //获取map中所有的key值 for(String schema: sSchemaActionResMap.keySet()) { + //若url可以添加则在添加后将defaultResId置为key所映射的值 if(urls[0].getURL().indexOf(schema) >= 0) { defaultResId = sSchemaActionResMap.get(schema); break; } } + ////defaultResId == 0则说明url并没有添加任何东西 if (defaultResId == 0) { + defaultResId = R.string.note_link_other; } - + //创建菜单 menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener( - new OnMenuItemClickListener() { + new OnMenuItemClickListener() {//创建按钮监听事件 public boolean onMenuItemClick(MenuItem item) { // goto a new intent + //根据相应的文本设置菜单的按键 urls[0].onClick(NoteEditText.this); return true; } }); } } + //执行父类的菜单创建事件 super.onCreateContextMenu(menu); } } diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java index 0f5a878..bf50d5d 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java @@ -28,20 +28,21 @@ import net.micode.notes.tool.DataUtils; public class NoteItemData { static final String [] PROJECTION = new String [] { - NoteColumns.ID, - NoteColumns.ALERTED_DATE, - NoteColumns.BG_COLOR_ID, - NoteColumns.CREATED_DATE, - NoteColumns.HAS_ATTACHMENT, - NoteColumns.MODIFIED_DATE, - NoteColumns.NOTES_COUNT, - NoteColumns.PARENT_ID, - NoteColumns.SNIPPET, - NoteColumns.TYPE, - NoteColumns.WIDGET_ID, - NoteColumns.WIDGET_TYPE, + NoteColumns.ID, + NoteColumns.ALERTED_DATE, + NoteColumns.BG_COLOR_ID, + NoteColumns.CREATED_DATE, + NoteColumns.HAS_ATTACHMENT, + NoteColumns.MODIFIED_DATE, + NoteColumns.NOTES_COUNT, + NoteColumns.PARENT_ID, + NoteColumns.SNIPPET, + NoteColumns.TYPE, + NoteColumns.WIDGET_ID, + NoteColumns.WIDGET_TYPE, }; + //常量设置 private static final int ID_COLUMN = 0; private static final int ALERTED_DATE_COLUMN = 1; private static final int BG_COLOR_ID_COLUMN = 2; @@ -76,7 +77,9 @@ public class NoteItemData { private boolean mIsOneNoteFollowingFolder; private boolean mIsMultiNotesFollowingFolder; + //初始化NoteItemData，主要利用光标cursor获取的东西 public NoteItemData(Context context, Cursor cursor) { + //变量设置 mId = cursor.getLong(ID_COLUMN); mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN); mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN); @@ -92,6 +95,7 @@ public class NoteItemData { mWidgetId = cursor.getInt(WIDGET_ID_COLUMN); mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN); + //初始化电话号码信息 mPhoneNumber = ""; if (mParentId == Notes.ID_CALL_RECORD_FOLDER) { mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId); @@ -109,22 +113,26 @@ public class NoteItemData { checkPostion(cursor); } + //根据鼠标的位置设置标记，和位置 private void checkPostion(Cursor cursor) { mIsLastItem = cursor.isLast() ? true : false; mIsFirstItem = cursor.isFirst() ? true : false; + mIsOnlyOneItem = (cursor.getCount() == 1); + //初始化“多重子文件”“单一子文件” mIsMultiNotesFollowingFolder = false; mIsOneNoteFollowingFolder = false; - if (mType == Notes.TYPE_NOTE && !mIsFirstItem) { + + if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {//若是note格式并且不是第一个元素 int position = cursor.getPosition(); - if (cursor.moveToPrevious()) { + if (cursor.moveToPrevious()) {//光标移动至上一行 if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) { if (cursor.getCount() > (position + 1)) { - mIsMultiNotesFollowingFolder = true; + mIsMultiNotesFollowingFolder = true;//多个文件初始化完成 } else { - mIsOneNoteFollowingFolder = true; + mIsOneNoteFollowingFolder = true;//单个文件初始化完成 } } if (!cursor.moveToNext()) { @@ -214,6 +222,7 @@ public class NoteItemData { return (mAlertDate > 0); } + //若数据父id为保存至文件夹模式的id且满足电话号码单元不为空，则isCallRecord为true public boolean isCallRecord() { return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber)); } diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 6fa1014..13224ad 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -60,6 +60,8 @@ import android.widget.PopupMenu; import android.widget.TextView; import android.widget.Toast; +//import androidx.appcompat.app.AppCompatActivity; + import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; @@ -78,11 +80,9 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.HashSet; -/** - * 这就是小米便签的主界面 - */ +//小米便签用户界面 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { - private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;//文件夹_笔记_列表_查询令牌 + private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; private static final int FOLDER_LIST_QUERY_TOKEN = 1; @@ -138,10 +138,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private final static int REQUEST_CODE_OPEN_NODE = 102; private final static int REQUEST_CODE_NEW_NODE = 103; + //创建 @Override - //创建类 - protected void onCreate(Bundle savedInstanceState) {//两个活动的连接可以用bundle来实现 - super.onCreate(savedInstanceState);//调用父类方法 + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); setContentView(R.layout.note_list); initResources(); @@ -154,24 +154,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override // 返回一些子模块完成的数据交给主Activity处理 protected void onActivityResult(int requestCode, int resultCode, Intent data) { - // 假设结果值 和 要求值 符合要求 + if (resultCode == RESULT_OK && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) { mNotesListAdapter.changeCursor(null); } else { - //不然将调用父类activity类的方法 super.onActivityResult(requestCode, resultCode, data); } } private void setAppInfoFromRawRes() { - // SharedPreferences类，它是一个轻量级的存储类，适合用于保存软件配置参数 SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) { StringBuilder sb = new StringBuilder(); InputStream in = null; try { - // 获取资源文件 in = getResources().openRawResource(R.raw.introduction); if (in != null) { InputStreamReader isr = new InputStreamReader(in); @@ -199,12 +196,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } - //创建空的便签 WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER, AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE, ResourceParser.RED); note.setWorkingText(sb.toString()); - //更新保存 if (note.saveNote()) { sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit(); } else { @@ -215,24 +210,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } @Override - /** - * 启动方法 - */ protected void onStart() { super.onStart(); startAsyncNotesListQuery(); } - /** - * 初始化资源 - */ private void initResources() { - //获取应用程序数据 mContentResolver = this.getContentResolver(); mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver()); mCurrentFolderId = Notes.ID_ROOT_FOLDER; - - //获得各种视图数据 mNotesListView = (ListView) findViewById(R.id.notes_list); mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null), null, false); @@ -251,9 +237,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mModeCallBack = new ModeCallback(); } - /** - * 模式回调方法 - */ private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener { private DropdownMenu mDropDownMenu; private ActionMode mActionMode; @@ -292,14 +275,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } - /** - * 更新菜单 - */ private void updateMenu() { int selectedCount = mNotesListAdapter.getSelectedCount(); // Update dropdown menu String format = getResources().getString(R.string.menu_select_title, selectedCount); - mDropDownMenu.setTitle(format);//设置标题 + mDropDownMenu.setTitle(format); MenuItem item = mDropDownMenu.findItem(R.id.action_select_all); if (item != null) { if (mNotesListAdapter.isAllSelected()) { @@ -349,7 +329,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt case R.id.delete: AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setIcon(R.drawable.bg_btn_set_color); builder.setMessage(getString(R.string.alert_message_delete_notes, mNotesListAdapter.getSelectedCount())); builder.setPositiveButton(android.R.string.ok, @@ -690,9 +670,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt }); } - /** - * 按返回键时更新数据 - */ @Override public void onBackPressed() { switch (mState) { @@ -717,11 +694,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } - /** - * 根据不同类型的widget更新插件，通过intent改变其属性 - * @param appWidgetId widget的id - * @param appWidgetType widget的形式 - */ private void updateWidget(int appWidgetId, int appWidgetType) { Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); if (appWidgetType == Notes.TYPE_WIDGET_2X) { @@ -741,9 +713,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt setResult(RESULT_OK, intent); } - /** - * 监听器，建立菜单，包括名称，视图，删除操作，更改名称操作； - */ private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() { public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { if (mFocusNoteDataItem != null) { @@ -764,7 +733,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } @Override - //针对menu中不同的选择进行不同的处理 public boolean onContextItemSelected(MenuItem item) { if (mFocusNoteDataItem == null) { Log.e(TAG, "The long click data item is null"); @@ -772,10 +740,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } switch (item.getItemId()) { case MENU_FOLDER_VIEW: - openFolder(mFocusNoteDataItem);//打开文件 + openFolder(mFocusNoteDataItem); break; case MENU_FOLDER_DELETE: - AlertDialog.Builder builder = new AlertDialog.Builder(this);//确认是否删除 + AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(getString(R.string.alert_title_delete)); builder.setIcon(android.R.drawable.ic_dialog_alert); builder.setMessage(getString(R.string.alert_message_delete_folder)); @@ -786,7 +754,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } }); builder.setNegativeButton(android.R.string.cancel, null); - builder.show();//显示对话框 + builder.show(); break; case MENU_FOLDER_CHANGE_NAME: showCreateOrModifyFolderDialog(false); @@ -862,7 +830,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } - //出口注释倒文本 private void exportNoteToText() { final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this); new AsyncTask() { @@ -915,7 +882,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt from.startActivityIfNeeded(intent, -1); } - //实现便签的点击 private class OnListItemClickListener implements OnItemClickListener { public void onItemClick(AdapterView parent, View view, int position, long id) { diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java index 51c9cb9..7d2dd57 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java @@ -30,56 +30,83 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; - +//便签表连接器，继承了CursorAdapter，它为cursor和ListView提供了连接的桥梁 +//NotesListAdapter实现的是鼠标和编辑便签链接的桥梁 public class NotesListAdapter extends CursorAdapter { private static final String TAG = "NotesListAdapter"; private Context mContext; private HashMap mSelectedIndex; - private int mNotesCount; - private boolean mChoiceMode; + private int mNotesCount; //标签数 + private boolean mChoiceMode; //选择模式标记 + /* + 桌面widget属性 + */ public static class AppWidgetAttribute { public int widgetId; public int widgetType; }; + /* + 构造器 初始化 + */ public NotesListAdapter(Context context) { - super(context, null); + super(context, null); //父类对象置空 mSelectedIndex = new HashMap(); mContext = context; mNotesCount = 0; } + /* + 函数功能：新建一个视图来存储光标所指向的数据 + 函数实现：使用兄弟类NotesListItem新建一个项目选项 + */ @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { return new NotesListItem(context); } + /* + 函数功能：将已经存在的视图和鼠标指向的数据进行捆绑 + */ @Override public void bindView(View view, Context context, Cursor cursor) { + //判断对象的类型 if (view instanceof NotesListItem) { + //新建一个项目选项并且用bind跟将view和鼠标，内容，便签数据捆绑在一起 NoteItemData itemData = new NoteItemData(context, cursor); ((NotesListItem) view).bind(context, itemData, mChoiceMode, isSelectedItem(cursor.getPosition())); } } + /* + 设置勾选框 + */ public void setCheckedItem(final int position, final boolean checked) { + //根据定位和是否勾选设置下标 mSelectedIndex.put(position, checked); + //在修改后刷新activity notifyDataSetChanged(); } + //判断是否勾选 public boolean isInChoiceMode() { return mChoiceMode; } + //函数功能：设置单项选项框 + //函数实现：重置下标并且根据参数mode设置选项 public void setChoiceMode(boolean mode) { mSelectedIndex.clear(); mChoiceMode = mode; } + //全选 public void selectAll(boolean checked) { + //得到光标 Cursor cursor = getCursor(); + //循环获取 全部选择 for (int i = 0; i < getCount(); i++) { if (cursor.moveToPosition(i)) { if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) { @@ -89,14 +116,20 @@ public class NotesListAdapter extends CursorAdapter { } } + //建立选择项的下标列表 public HashSet getSelectedItemIds() { + //创建hash表 HashSet itemSet = new HashSet(); + //遍历 for (Integer position : mSelectedIndex.keySet()) { + //查看光标是否可用 if (mSelectedIndex.get(position) == true) { Long id = getItemId(position); if (id == Notes.ID_ROOT_FOLDER) { + //报错 Log.d(TAG, "Wrong item id, should not happen"); } else { + //满足条件添加id itemSet.add(id); } } @@ -105,10 +138,12 @@ public class NotesListAdapter extends CursorAdapter { return itemSet; } + //建立桌面Widget的选项表 public HashSet getSelectedWidget() { HashSet itemSet = new HashSet(); for (Integer position : mSelectedIndex.keySet()) { if (mSelectedIndex.get(position) == true) { + //得到cursor 光标 Cursor c = (Cursor) getItem(position); if (c != null) { AppWidgetAttribute widget = new AppWidgetAttribute(); @@ -128,6 +163,7 @@ public class NotesListAdapter extends CursorAdapter { return itemSet; } + //获取选项个数 public int getSelectedCount() { Collection values = mSelectedIndex.values(); if (null == values) { @@ -143,11 +179,13 @@ public class NotesListAdapter extends CursorAdapter { return count; } + //是否全选 public boolean isAllSelected() { int checkedCount = getSelectedCount(); return (checkedCount != 0 && checkedCount == mNotesCount); } + //判断是否为选项表 public boolean isSelectedItem(final int position) { if (null == mSelectedIndex.get(position)) { return false; @@ -155,18 +193,21 @@ public class NotesListAdapter extends CursorAdapter { return mSelectedIndex.get(position); } + //内容发生更改时调用 @Override protected void onContentChanged() { super.onContentChanged(); calcNotesCount(); } + //在activity光标发生局部变动的时候回调该函数计算便签的数量 @Override public void changeCursor(Cursor cursor) { super.changeCursor(cursor); calcNotesCount(); } + //计算便签数量 private void calcNotesCount() { mNotesCount = 0; for (int i = 0; i < getCount(); i++) { diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListItem.java index 1221e80..684b40d 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -30,16 +30,21 @@ import net.micode.notes.tool.DataUtils; import net.micode.notes.tool.ResourceParser.NoteItemBgResources; +//创建便签列表项目选项 public class NotesListItem extends LinearLayout { - private ImageView mAlert; - private TextView mTitle; - private TextView mTime; + private ImageView mAlert; //闹钟图片 + private TextView mTitle; //标题 + private TextView mTime; //时间 private TextView mCallName; - private NoteItemData mItemData; - private CheckBox mCheckBox; + private NoteItemData mItemData; //标签数据 + private CheckBox mCheckBox; //打钩框 + /* + 初始化基本信息 + */ public NotesListItem(Context context) { super(context); + inflate(context, R.layout.note_item, this); mAlert = (ImageView) findViewById(R.id.iv_alert_icon); mTitle = (TextView) findViewById(R.id.tv_title); @@ -48,10 +53,11 @@ public class NotesListItem extends LinearLayout { mCheckBox = (CheckBox) findViewById(android.R.id.checkbox); } + //根据data的属性对各个控件的属性的控制，主要是可见性Visibility，内容setText，格式setTextAppearance public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) { if (choiceMode && data.getType() == Notes.TYPE_NOTE) { - mCheckBox.setVisibility(View.VISIBLE); - mCheckBox.setChecked(checked); + mCheckBox.setVisibility(View.VISIBLE); //设置可见行为可见 + mCheckBox.setChecked(checked); //格子打钩 } else { mCheckBox.setVisibility(View.GONE); } @@ -82,7 +88,7 @@ public class NotesListItem extends LinearLayout { if (data.getType() == Notes.TYPE_FOLDER) { mTitle.setText(data.getSnippet() + context.getString(R.string.format_folder_files_count, - data.getNotesCount())); + data.getNotesCount())); mAlert.setVisibility(View.GONE); } else { mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); diff --git a/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java index a954fa4..bbb0492 100644 --- a/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java +++ b/Notes-master2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java @@ -18,7 +18,6 @@ package net.micode.notes.ui; import android.accounts.Account; import android.accounts.AccountManager; -import android.annotation.SuppressLint; import android.app.ActionBar; import android.app.AlertDialog; import android.content.BroadcastReceiver; @@ -49,9 +48,6 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.gtask.remote.GTaskSyncService; -/** - * NotesPreferenceActivity在小米便签中主要实现的是对背景颜色和字体大小的数据储存。 - */ public class NotesPreferenceActivity extends PreferenceActivity { public static final String PREFERENCE_NAME = "notes_preferences"; @@ -73,20 +69,14 @@ public class NotesPreferenceActivity extends PreferenceActivity { private boolean mHasAddedAccount; - /** - * 创建一个activity，在函数里要完成所有的正常静态设置 - * @param icicle 存放当前状态 - */ @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); /* using the app icon for navigation */ - getActionBar().setDisplayHomeAsUpEnabled(true);//在左上角增加一个返回图标 + getActionBar().setDisplayHomeAsUpEnabled(true); - //增加xml来源 addPreferencesFromResource(R.xml.preferences); - //同步账户关键码来初始化分组 mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY); mReceiver = new GTaskReceiver(); IntentFilter filter = new IntentFilter(); @@ -94,16 +84,10 @@ public class NotesPreferenceActivity extends PreferenceActivity { registerReceiver(mReceiver, filter); mOriAccounts = null; - //获取listvivew，ListView的作用:用于列出所有选择 - //View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);改成了注释形式 - @SuppressLint("InflateParams") View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); - //在listview组件上方添加其他组件 + View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); getListView().addHeaderView(header, null, true); } - /** - * activity交互功能的实现，用于接受用户的输入 - */ @Override protected void onResume() { super.onResume(); @@ -132,9 +116,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { refreshUI(); } - /** - * 销毁一个activity - */ @Override protected void onDestroy() { if (mReceiver != null) { @@ -143,9 +124,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { super.onDestroy(); } - /** - * 重新设置账户信息 - */ private void loadAccountPreference() { mAccountCategory.removeAll(); @@ -166,7 +144,7 @@ public class NotesPreferenceActivity extends PreferenceActivity { } } else { Toast.makeText(NotesPreferenceActivity.this, - R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT) + R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT) .show(); } return true; @@ -176,9 +154,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { mAccountCategory.addPreference(accountPref); } - /** - * 设置按键的状态和最后同步的时间 - */ private void loadSyncButton() { Button syncButton = (Button) findViewById(R.id.preference_sync_button); TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview); @@ -218,17 +193,11 @@ public class NotesPreferenceActivity extends PreferenceActivity { } } - /** - * 刷新标签界面，实时更新展示 - */ private void refreshUI() { loadAccountPreference(); loadSyncButton(); } - /** - * 显示用户选择的对话框并进行账户的设置 - */ private void showSelectAccountAlertDialog() { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); @@ -277,7 +246,7 @@ public class NotesPreferenceActivity extends PreferenceActivity { mHasAddedAccount = true; Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] { - "gmail-ls" + "gmail-ls" }); startActivityForResult(intent, -1); dialog.dismiss(); @@ -285,9 +254,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { }); } - /** - * 显示账户选择对话框和相关账户操作 - */ private void showChangeAccountConfirmAlertDialog() { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); @@ -317,19 +283,11 @@ public class NotesPreferenceActivity extends PreferenceActivity { dialogBuilder.show(); } - /** - * 获取谷歌账户 - * @return 返回谷歌用户 - */ private Account[] getGoogleAccounts() { AccountManager accountManager = AccountManager.get(this); return accountManager.getAccountsByType("com.google"); } - /** - * 设置同步用户 - * @param account 同步用户参数 - */ private void setSyncAccount(String account) { if (!getSyncAccountName(this).equals(account)) { SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); @@ -360,23 +318,16 @@ public class NotesPreferenceActivity extends PreferenceActivity { } } - /** - * 删除同步用户 - */ private void removeSyncAccount() { - //设置共享首选项 SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); SharedPreferences.Editor editor = settings.edit(); - //假如当前首选项有账户就删除 if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) { editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME); } - //删除当前首选项中有账户时间 if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) { editor.remove(PREFERENCE_LAST_SYNC_TIME); } - //提交数据 - editor.apply(); + editor.commit(); // clean up local gtask related info new Thread(new Runnable() {