diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId49 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId49 new file mode 100644 index 0000000..75ae652 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId49 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId42 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId42 new file mode 100644 index 0000000..b964ed4 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId42 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmReceiver.class.uniqueId34 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmReceiver.class.uniqueId34 new file mode 100644 index 0000000..7118088 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmReceiver.class.uniqueId34 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$1.class.uniqueId41 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$1.class.uniqueId41 new file mode 100644 index 0000000..6409b67 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$1.class.uniqueId41 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$2.class.uniqueId31 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$2.class.uniqueId31 new file mode 100644 index 0000000..16704b5 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$2.class.uniqueId31 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$3.class.uniqueId10 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$3.class.uniqueId10 new file mode 100644 index 0000000..e3d9c96 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$3.class.uniqueId10 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$4.class.uniqueId51 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$4.class.uniqueId51 new file mode 100644 index 0000000..e286885 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$4.class.uniqueId51 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$OnDateTimeChangedListener.class.uniqueId56 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$OnDateTimeChangedListener.class.uniqueId56 new file mode 100644 index 0000000..255a4e6 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$OnDateTimeChangedListener.class.uniqueId56 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker.class.uniqueId12 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker.class.uniqueId12 new file mode 100644 index 0000000..a95f925 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker.class.uniqueId12 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$1.class.uniqueId29 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$1.class.uniqueId29 new file mode 100644 index 0000000..2191430 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$1.class.uniqueId29 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$OnDateTimeSetListener.class.uniqueId43 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$OnDateTimeSetListener.class.uniqueId43 new file mode 100644 index 0000000..70481dd Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$OnDateTimeSetListener.class.uniqueId43 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog.class.uniqueId14 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog.class.uniqueId14 new file mode 100644 index 0000000..7ef0abc Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog.class.uniqueId14 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu$1.class.uniqueId20 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu$1.class.uniqueId20 new file mode 100644 index 0000000..c926b67 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu$1.class.uniqueId20 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu.class.uniqueId22 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu.class.uniqueId22 new file mode 100644 index 0000000..71a0091 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu.class.uniqueId22 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId23 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId23 new file mode 100644 index 0000000..47a468c Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId23 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId16 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId16 new file mode 100644 index 0000000..4e56d58 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId16 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId0 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId0 new file mode 100644 index 0000000..fb05b20 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId0 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId47 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId47 new file mode 100644 index 0000000..f73069c Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId47 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId13 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId13 new file mode 100644 index 0000000..1a6aedc Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId13 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId5 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId5 new file mode 100644 index 0000000..06799d1 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId5 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId44 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId44 new file mode 100644 index 0000000..dfffa21 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId44 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId25 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId25 new file mode 100644 index 0000000..7d42a84 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId25 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId46 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId46 new file mode 100644 index 0000000..8e3e9ce Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId46 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId26 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId26 new file mode 100644 index 0000000..f6a7826 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId26 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$1.class.uniqueId18 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$1.class.uniqueId18 new file mode 100644 index 0000000..fbeff49 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$1.class.uniqueId18 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$OnTextViewChangeListener.class.uniqueId32 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$OnTextViewChangeListener.class.uniqueId32 new file mode 100644 index 0000000..9874f47 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$OnTextViewChangeListener.class.uniqueId32 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText.class.uniqueId1 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText.class.uniqueId1 new file mode 100644 index 0000000..e0eea60 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText.class.uniqueId1 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId55 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId55 new file mode 100644 index 0000000..771aa91 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId55 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId24 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId24 new file mode 100644 index 0000000..a00281f Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId24 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId37 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId37 new file mode 100644 index 0000000..05bc982 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId37 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId6 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId6 new file mode 100644 index 0000000..fb92d6c Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId6 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId17 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId17 new file mode 100644 index 0000000..659c454 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId17 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId28 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId28 new file mode 100644 index 0000000..324b349 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId28 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId39 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId39 new file mode 100644 index 0000000..a090d40 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId39 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId3 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId3 new file mode 100644 index 0000000..de4e408 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId3 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId35 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId35 new file mode 100644 index 0000000..93cbf94 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId35 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId52 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId52 new file mode 100644 index 0000000..3fc279b Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId52 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId9 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId9 new file mode 100644 index 0000000..2312a28 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId9 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId45 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId45 new file mode 100644 index 0000000..de48358 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId45 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId40 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId40 new file mode 100644 index 0000000..cb50f1d Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId40 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId50 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId50 new file mode 100644 index 0000000..08950d5 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId50 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId4 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId4 new file mode 100644 index 0000000..2cdacee Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId4 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId27 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId27 new file mode 100644 index 0000000..bde970e Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId27 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId11 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId11 new file mode 100644 index 0000000..110a0b1 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId11 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId15 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId15 new file mode 100644 index 0000000..ea940a9 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId15 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId38 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId38 new file mode 100644 index 0000000..79e06a7 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId38 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId36 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId36 new file mode 100644 index 0000000..4d5c288 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId36 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId53 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId53 new file mode 100644 index 0000000..47c78ef Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId53 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId19 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId19 new file mode 100644 index 0000000..baa7752 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId19 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId30 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId30 new file mode 100644 index 0000000..1cc346a Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId30 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId57 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId57 new file mode 100644 index 0000000..320d722 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId57 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId8 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId8 new file mode 100644 index 0000000..0f88f2b Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId8 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId21 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId21 new file mode 100644 index 0000000..4691731 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId21 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId54 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId54 new file mode 100644 index 0000000..56f7e5c Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId54 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId48 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId48 new file mode 100644 index 0000000..8329599 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId48 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId2 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId2 new file mode 100644 index 0000000..6c4e83e Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId2 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId7 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId7 new file mode 100644 index 0000000..15f1f77 Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId7 differ diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId33 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId33 new file mode 100644 index 0000000..ec6183a Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId33 differ diff --git a/src/main/java/net/micode/notes/data/Contact.java b/src/main/java/net/micode/notes/data/Contact.java index 95d8bce..39e6f09 100644 --- a/src/main/java/net/micode/notes/data/Contact.java +++ b/src/main/java/net/micode/notes/data/Contact.java @@ -25,6 +25,7 @@ import android.util.Log; import java.util.HashMap; /** +<<<<<<<< HEAD:src/main/java/net/micode/notes/data/Contact.java * @Package: net.micode.notes.data * @ClassName: Contact * @Description: @@ -36,6 +37,29 @@ public class Contact { private static HashMap sContactCache; private static final String TAG = "Contact"; +======== + * @Package: net.micode.notes.data + * @ClassName: Contact + * @Description: + * Contact类用于查询联系人信息并进行缓存。 + * 该类包含一个静态的HashMap作为缓存，存储电话号码和对应的联系人名字。 + * 通过调用getContact方法可以根据给定的电话号码查询联系人名字。 + * 如果缓存中已经存在该电话号码对应的联系人名字，则直接返回缓存中的结果，否则通过查询数据库获取联系人名字并更新缓存。 + * 该类还定义了一个私有的SQL筛选语句用于查询联系人信息。 + * 注意：该类是线程不安全的，如果需要在多线程环境下使用，请做好同步控制 + * @Author: YangYizhe + * @CreateDate: 12/17/2023 10:10 AM + * @Version: 1.0 + */ +public class Contact { + /** + * 作为缓存,存储电话号码和对应的联系人名字 + */ + private static HashMap sContactCache; + private static final String TAG = "Contact";//设置日志TAG标签 + + //查询联系人的SQL筛选语句 +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/data/Contact.java private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + " AND " + Data.RAW_CONTACT_ID + " IN " diff --git a/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java index b740b4a..29e35af 100644 --- a/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -71,6 +71,12 @@ import java.util.regex.Pattern; */ public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java +======== + /** + * 类属性的定义 + */ +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java private class HeadViewHolder { public TextView tvModified; @@ -382,6 +388,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, showAlertHeader(); convertToImage();//将路径转化未图片 } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java /** * @method showAlertHeader * @description @@ -393,6 +400,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, * @date: 12/24/2023 6:24 PM * @author: YangYizhe */ +======== + +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java private void showAlertHeader() { if (mWorkingNote.hasClockAlert()) { long time = System.currentTimeMillis(); @@ -505,12 +515,15 @@ public class NoteEditActivity extends Activity implements OnClickListener, } clearSettingState(); } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java /** * @method updateWidget * @description 更新小部件的操作 * @date: 12/24/2023 6:21 PM * @author: YangYizhe */ +======== +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java private void updateWidget() { Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) { @@ -758,6 +771,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, showToast(R.string.error_note_empty_for_clock); } } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java /** * 当小部件发生改变时调用updateWidget */ @@ -772,6 +786,11 @@ public class NoteEditActivity extends Activity implements OnClickListener, * @param index 文本框索引 * @param text 文本框中的文本内容 */ +======== + public void onWidgetChanged() { + updateWidget(); + } +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java public void onEditTextDelete(int index, String text) { int childCount = mEditTextList.getChildCount(); if (childCount == 1) { @@ -797,6 +816,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, edit.requestFocus(); edit.setSelection(length); } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java /** * @method onEditTextEnter * @description 编辑文本框中按下回车键的操作 @@ -805,6 +825,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, * @param index 文本框索引 * @param text 文本框中的文本内容 */ +======== +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java public void onEditTextEnter(int index, String text) { /** * Should not happen, check for debug @@ -823,6 +845,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, .setIndex(i); } } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java /** * @method switchToListMode * @description 切换到列表模式 @@ -830,6 +853,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, * @author: YangYizhe * @param text 列表文本 */ +======== +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java private void switchToListMode(String text) { mEditTextList.removeAllViews(); String[] items = text.split("\n"); @@ -846,6 +871,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, mNoteEditor.setVisibility(View.GONE); mEditTextList.setVisibility(View.VISIBLE); } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java /** * @method getHighlightQueryResult * @description 获取高亮查询结果 @@ -855,6 +881,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, * @param userQuery 用户查询关键词 * @return 带有高亮效果的 Spannable 对象 */ +======== +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java private Spannable getHighlightQueryResult(String fullText, String userQuery) { SpannableString spannable = new SpannableString(fullText == null ? "" : fullText); if (!TextUtils.isEmpty(userQuery)) { @@ -871,6 +899,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } return spannable; } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java /** * @method getListItem * @description 获取列表项视图 @@ -880,6 +909,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, * @param index 列表项索引 * @return 列表项视图 */ +======== +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java private View getListItem(String item, int index) { View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null); final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); @@ -910,6 +941,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, edit.setText(getHighlightQueryResult(item, mUserQuery)); return view; } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java /** * @method onTextChange * @description 当文本内容发生变化时的处理方法 @@ -918,6 +950,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, * @param index 文本索引 * @param hasText 是否有文本内容 */ +======== +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java public void onTextChange(int index, boolean hasText) { if (index >= mEditTextList.getChildCount()) { Log.e(TAG, "Wrong index, should not happen"); @@ -929,6 +963,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE); } } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java /** * @method onCheckListModeChanged * @description 当检查列表模式发生变化时的处理方法 @@ -937,6 +972,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, * @param oldMode 旧的模式 * @param newMode 新的模式 */ +======== + +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java public void onCheckListModeChanged(int oldMode, int newMode) { if (newMode == TextNote.MODE_CHECK_LIST) { switchToListMode(mNoteEditor.getText().toString()); @@ -950,6 +988,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, mNoteEditor.setVisibility(View.VISIBLE); } } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java /** * @method getWorkingText * @description 获取正在编辑的文本内容 @@ -957,6 +996,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, * @author: YangYizhe * @return 是否存在已打钩的选项 */ +======== +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java private boolean getWorkingText() { boolean hasChecked = false;//初始化check标记 if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { @@ -996,6 +1037,11 @@ public class NoteEditActivity extends Activity implements OnClickListener, * 保存便签,退出时候会自动调本函数 * @date: 12/21/2023 8:14 AM * @author: YangYizhe +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java +======== + * @param + * @return +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java */ private boolean saveNote() { getWorkingText(); @@ -1020,6 +1066,11 @@ public class NoteEditActivity extends Activity implements OnClickListener, * send to home功能，发到桌面上 * @date: 12/21/2023 8:15 AM * @author: YangYizhe +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java +======== + * @param + * @return +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java */ private void sendToDesktop() { /** @@ -1055,6 +1106,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, showToast(R.string.error_note_empty_for_send_to_desktop); } } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditActivity.java /** * @method makeShortcutIconTitle * @description 生成快捷方式图标标题 @@ -1063,6 +1115,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, * @param content 内容 * @return 生成的快捷方式图标标题 */ +======== +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java private String makeShortcutIconTitle(String content) { content = content.replace(TAG_CHECKED, ""); content = content.replace(TAG_UNCHECKED, ""); diff --git a/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/main/java/net/micode/notes/ui/NoteEditText.java index d29d3d2..ec2eda6 100644 --- a/src/main/java/net/micode/notes/ui/NoteEditText.java +++ b/src/main/java/net/micode/notes/ui/NoteEditText.java @@ -46,12 +46,28 @@ import java.util.Map; * @Version: 1.0 */ public class NoteEditText extends EditText { +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditText.java private static final String TAG = "NoteEditText"; private int mIndex; private int mSelectionStartBeforeDelete; private static final String SCHEME_TEL = "tel:" ; private static final String SCHEME_HTTP = "http:" ; private static final String SCHEME_EMAIL = "mailto:" ; +======== + //常量标识 + private static final String TAG = "NoteEditText"; + //声明整型变量，文本索引 + private int mIndex; + //声明整型变量 + private int mSelectionStartBeforeDelete; + + //声明字符串常量，标志电话、网址、邮件 + private static final String SCHEME_TEL = "tel:" ; + private static final String SCHEME_HTTP = "http:" ; + private static final String SCHEME_EMAIL = "mailto:" ; + + //设置映射，将文本内容（电话、网址、邮件）做链接处理 +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java private static final Map sSchemaActionResMap = new HashMap(); static { sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel); @@ -96,9 +112,13 @@ public class NoteEditText extends EditText { mIndex = 0; } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditText.java /** * 设置索引号 */ +======== + //设置索引号 +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java public void setIndex(int index) { mIndex = index; } @@ -124,6 +144,17 @@ public class NoteEditText extends EditText { // TODO Auto-generated constructor stub } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditText.java +======== + /** + * @method onTouchEvent + * @description 处理触摸事件，根据触摸点的位置设置光标的位置 + * @date: 12/21/2023 12:41 AM + * @author: YangYizhe + * @param + * @return + */ +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java @Override /** * @method onTouchEvent @@ -235,6 +266,17 @@ public class NoteEditText extends EditText { super.onFocusChanged(focused, direction, previouslyFocusedRect); } +<<<<<<<< HEAD:src/main/java/net/micode/notes/ui/NoteEditText.java +======== + /** + * @method onCreateContextMenu + * @description + * @date: 12/21/2023 12:39 AM + * @author: YangYizhe + * @param + * @return + */ +>>>>>>>> b654a61 (code):src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java @Override /** * @method onCreateContextMenu