Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gradle/7.0.2/executionHistory/executionHistory.bin
#	.gradle/7.0.2/executionHistory/executionHistory.lock
#	.gradle/7.0.2/fileHashes/fileHashes.bin
#	.gradle/7.0.2/fileHashes/fileHashes.lock
#	.gradle/7.0.2/fileHashes/resourceHashesCache.bin
#	.gradle/7.0.2/javaCompile/classAnalysis.bin
#	.gradle/7.0.2/javaCompile/jarAnalysis.bin
#	.gradle/7.0.2/javaCompile/javaCompile.lock
#	.gradle/7.0.2/javaCompile/taskHistory.bin
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
#	app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json
#	app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
#	app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
#	app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
#	app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
#	app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
#	app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
#	app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
#	app/build/intermediates/dex_archive_input_jar_hashes/debug/out
#	app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json
#	app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
#	app/build/intermediates/incremental/mergeDebugAssets/merger.xml
#	app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
#	app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
#	app/build/intermediates/incremental/mergeDebugResources/merger.xml
#	app/build/intermediates/incremental/mergeDebugShaders/merger.xml
#	app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
#	app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivitySplashBinding.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditListItemBinding.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
#	app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
#	app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat
#	app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_hutao.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_keli.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_mi.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_mi1.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_op_start.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat
#	app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat
#	app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat
#	app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat
#	app/build/intermediates/merged_res/debug/layout_acticity_word.xml.flat
#	app/build/intermediates/merged_res/debug/layout_activity_splash.xml.flat
#	app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat
#	app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat
#	app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat
#	app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat
#	app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
#	app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat
#	app/build/intermediates/merged_res/debug/layout_note_item.xml.flat
#	app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
#	app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat
#	app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat
#	app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat
#	app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat
#	app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat
#	app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat
#	app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat
#	app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
#	app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
#	app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat
#	app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat
#	app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
#	app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
#	app/build/intermediates/merged_res/debug/raw_introduction.flat
#	app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat
#	app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat
#	app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat
#	app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat
#	app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat
#	app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat
#	app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat
#	app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat
#	app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat
#	app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat
#	app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat
#	app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat
#	app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat
#	app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat
#	app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat
#	app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat
#	app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat
#	app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat
#	app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat
#	app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat
#	app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat
#	app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat
#	app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat
#	app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat
#	app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat
#	app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat
#	app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat
#	app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat
#	app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat
#	app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat
#	app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat
#	app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat
#	app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat
#	app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat
#	app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat
#	app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat
#	app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat
#	app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat
#	app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat
#	app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat
#	app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat
#	app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat
#	app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat
#	app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat
#	app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat
#	app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat
#	app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat
#	app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat
#	app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat
#	app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat
#	app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat
#	app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat
#	app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat
#	app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat
#	app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat
#	app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat
#	app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat
#	app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat
#	app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat
#	app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat
#	app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat
#	app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat
#	app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat
#	app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat
#	app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat
#	app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat
#	app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat
#	app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat
#	app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat
#	app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat
#	app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat
#	app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat
#	app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat
#	app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat
#	app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat
#	app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat
#	app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat
#	app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat
#	app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat
#	app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat
#	app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat
#	app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat
#	app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat
#	app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat
#	app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat
#	app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat
#	app/build/intermediates/merged_res/debug/values-w1240dp-v13_values-w1240dp-v13.arsc.flat
#	app/build/intermediates/merged_res/debug/values-w600dp-v13_values-w600dp-v13.arsc.flat
#	app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat
#	app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat
#	app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat
#	app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
#	app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat
#	app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
#	app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat
#	app/build/intermediates/merged_res/debug/values_values.arsc.flat
#	app/build/intermediates/merged_res/debug/xml_preferences.xml.flat
#	app/build/intermediates/merged_res/debug/xml_searchable.xml.flat
#	app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat
#	app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w1240dp-v13.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-w600dp-v13.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
#	app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json
#	app/build/intermediates/processed_res/debug/out/resources-debug.ap_
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/ActivitySplashBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/DatetimePickerBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/FolderListItemBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteEditBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteEditListItemBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteItemBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteListBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteListDropdownMenuBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/SettingsHeaderBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/Widget2xBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/Widget4xBinding.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
#	app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
#	app/build/intermediates/runtime_symbol_list/debug/R.txt
#	app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
#	app/build/outputs/apk/debug/app-debug.apk
#	app/build/outputs/logs/manifest-merger-debug-report.txt
#	local.properties
master
ShakeJ96 2 years ago
commit f5e2cb6ae6

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="17" /> <bytecodeTargetLevel target="11" />
</component> </component>
</project> </project>

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\15000\.android\avd\Pixel_3a_API_34_extension_level_7_x86_64.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-12-10T09:38:19.464506900Z" />
</component>
</project>

@ -7,7 +7,7 @@
<option name="testRunner" value="GRADLE" /> <option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="16" /> <option name="gradleJvm" value="jbr-17" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

@ -8,6 +8,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.viewbinding.ViewBinding; import android.viewbinding.ViewBinding;
import android.viewbinding.ViewBindings; import android.viewbinding.ViewBindings;
import android.widget.Button;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
@ -25,6 +26,9 @@ public final class NoteEditBinding implements ViewBinding {
@NonNull @NonNull
public final ImageView btnSetBgColor; public final ImageView btnSetBgColor;
@NonNull
public final Button buttonPlayAudio;
@NonNull @NonNull
public final LinearLayout fontSizeSelector; public final LinearLayout fontSizeSelector;
@ -110,8 +114,9 @@ public final class NoteEditBinding implements ViewBinding {
public final TextView tvModifiedDate; public final TextView tvModifiedDate;
private NoteEditBinding(@NonNull FrameLayout rootView, @NonNull ImageView btnSetBgColor, private NoteEditBinding(@NonNull FrameLayout rootView, @NonNull ImageView btnSetBgColor,
@NonNull LinearLayout fontSizeSelector, @NonNull ImageView ivAlertIcon, @NonNull Button buttonPlayAudio, @NonNull LinearLayout fontSizeSelector,
@NonNull ImageView ivBgBlue, @NonNull ImageView ivBgBlueSelect, @NonNull ImageView ivBgGreen, @NonNull ImageView ivAlertIcon, @NonNull ImageView ivBgBlue,
@NonNull ImageView ivBgBlueSelect, @NonNull ImageView ivBgGreen,
@NonNull ImageView ivBgGreenSelect, @NonNull ImageView ivBgRed, @NonNull ImageView ivBgGreenSelect, @NonNull ImageView ivBgRed,
@NonNull ImageView ivBgRedSelect, @NonNull ImageView ivBgWhite, @NonNull ImageView ivBgRedSelect, @NonNull ImageView ivBgWhite,
@NonNull ImageView ivBgWhiteSelect, @NonNull ImageView ivBgYellow, @NonNull ImageView ivBgWhiteSelect, @NonNull ImageView ivBgYellow,
@ -125,6 +130,7 @@ public final class NoteEditBinding implements ViewBinding {
@NonNull TextView tvAlertDate, @NonNull TextView tvModifiedDate) { @NonNull TextView tvAlertDate, @NonNull TextView tvModifiedDate) {
this.rootView = rootView; this.rootView = rootView;
this.btnSetBgColor = btnSetBgColor; this.btnSetBgColor = btnSetBgColor;
this.buttonPlayAudio = buttonPlayAudio;
this.fontSizeSelector = fontSizeSelector; this.fontSizeSelector = fontSizeSelector;
this.ivAlertIcon = ivAlertIcon; this.ivAlertIcon = ivAlertIcon;
this.ivBgBlue = ivBgBlue; this.ivBgBlue = ivBgBlue;
@ -188,6 +194,12 @@ public final class NoteEditBinding implements ViewBinding {
break missingId; break missingId;
} }
id = R.id.button_play_audio;
Button buttonPlayAudio = ViewBindings.findChildViewById(rootView, id);
if (buttonPlayAudio == null) {
break missingId;
}
id = R.id.font_size_selector; id = R.id.font_size_selector;
LinearLayout fontSizeSelector = ViewBindings.findChildViewById(rootView, id); LinearLayout fontSizeSelector = ViewBindings.findChildViewById(rootView, id);
if (fontSizeSelector == null) { if (fontSizeSelector == null) {
@ -356,12 +368,12 @@ public final class NoteEditBinding implements ViewBinding {
break missingId; break missingId;
} }
return new NoteEditBinding((FrameLayout) rootView, btnSetBgColor, fontSizeSelector, return new NoteEditBinding((FrameLayout) rootView, btnSetBgColor, buttonPlayAudio,
ivAlertIcon, ivBgBlue, ivBgBlueSelect, ivBgGreen, ivBgGreenSelect, ivBgRed, ivBgRedSelect, fontSizeSelector, ivAlertIcon, ivBgBlue, ivBgBlueSelect, ivBgGreen, ivBgGreenSelect,
ivBgWhite, ivBgWhiteSelect, ivBgYellow, ivBgYellowSelect, ivLargeSelect, ivMediumSelect, ivBgRed, ivBgRedSelect, ivBgWhite, ivBgWhiteSelect, ivBgYellow, ivBgYellowSelect,
ivSmallSelect, ivSuperSelect, llFontLarge, llFontNormal, llFontSmall, llFontSuper, ivLargeSelect, ivMediumSelect, ivSmallSelect, ivSuperSelect, llFontLarge, llFontNormal,
noteBgColorSelector, noteEditList, noteEditView, noteTitle, svNoteEdit, textNum, llFontSmall, llFontSuper, noteBgColorSelector, noteEditList, noteEditView, noteTitle,
tvAlertDate, tvModifiedDate); svNoteEdit, textNum, tvAlertDate, tvModifiedDate);
} }
String missingId = rootView.getResources().getResourceName(id); String missingId = rootView.getResources().getResourceName(id);
throw new NullPointerException("Missing required view with ID: ".concat(missingId)); throw new NullPointerException("Missing required view with ID: ".concat(missingId));

@ -1 +1 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_edit" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_edit.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_edit_0" view="FrameLayout"><Expressions/><location startLine="17" startOffset="0" endLine="435" endOffset="13"/></Target><Target id="@+id/note_title" view="LinearLayout"><Expressions/><location startLine="28" startOffset="8" endLine="64" endOffset="22"/></Target><Target id="@+id/tv_modified_date" view="TextView"><Expressions/><location startLine="33" startOffset="12" endLine="40" endOffset="77"/></Target><Target id="@+id/iv_alert_icon" view="ImageView"><Expressions/><location startLine="42" startOffset="12" endLine="47" endOffset="60"/></Target><Target id="@+id/tv_alert_date" view="TextView"><Expressions/><location startLine="49" startOffset="12" endLine="56" endOffset="77"/></Target><Target id="@+id/sv_note_edit" view="LinearLayout"><Expressions/><location startLine="69" startOffset="8" endLine="123" endOffset="22"/></Target><Target id="@+id/note_edit_view" view="net.micode.notes.ui.NoteEditText"><Expressions/><location startLine="94" startOffset="20" endLine="105" endOffset="53"/></Target><Target id="@+id/note_edit_list" view="LinearLayout"><Expressions/><location startLine="107" startOffset="20" endLine="113" endOffset="51"/></Target><Target id="@+id/btn_set_bg_color" view="ImageView"><Expressions/><location startLine="126" startOffset="4" endLine="131" endOffset="44"/></Target><Target id="@+id/note_bg_color_selector" view="LinearLayout"><Expressions/><location startLine="133" startOffset="4" endLine="245" endOffset="18"/></Target><Target id="@+id/iv_bg_yellow" view="ImageView"><Expressions/><location startLine="148" startOffset="12" endLine="151" endOffset="54"/></Target><Target id="@+id/iv_bg_yellow_select" view="ImageView"><Expressions/><location startLine="153" startOffset="12" endLine="161" endOffset="50"/></Target><Target id="@+id/iv_bg_blue" view="ImageView"><Expressions/><location startLine="169" startOffset="12" endLine="172" endOffset="54"/></Target><Target id="@+id/iv_bg_blue_select" view="ImageView"><Expressions/><location startLine="174" startOffset="12" endLine="182" endOffset="50"/></Target><Target id="@+id/iv_bg_white" view="ImageView"><Expressions/><location startLine="190" startOffset="12" endLine="193" endOffset="54"/></Target><Target id="@+id/iv_bg_white_select" view="ImageView"><Expressions/><location startLine="195" startOffset="12" endLine="203" endOffset="50"/></Target><Target id="@+id/iv_bg_green" view="ImageView"><Expressions/><location startLine="211" startOffset="12" endLine="214" endOffset="54"/></Target><Target id="@+id/iv_bg_green_select" view="ImageView"><Expressions/><location startLine="216" startOffset="12" endLine="223" endOffset="50"/></Target><Target id="@+id/iv_bg_red" view="ImageView"><Expressions/><location startLine="231" startOffset="12" endLine="234" endOffset="54"/></Target><Target id="@+id/iv_bg_red_select" view="ImageView"><Expressions/><location startLine="236" startOffset="12" endLine="243" endOffset="50"/></Target><Target id="@+id/font_size_selector" view="LinearLayout"><Expressions/><location startLine="248" startOffset="4" endLine="411" endOffset="18"/></Target><Target id="@+id/ll_font_small" view="FrameLayout"><Expressions/><location startLine="257" startOffset="8" endLine="293" endOffset="21"/></Target><Target id="@+id/iv_small_select" view="ImageView"><Expressions/><location startLine="283" startOffset="12" endLine="292" endOffset="50"/></Target><Target id="@+id/ll_font_normal" view="FrameLayout"><Expressions/><location startLine="296" startOffset="8" endLine="332" endOffset="21"/></Target><Target id="@+id/iv_medium_select" view="ImageView"><Expressions/><location startLine="322" startOffset="12" endLine="331" endOffset="50"/></Target><Target id="@+id/ll_font_large" view="FrameLayout"><Expressions/><location startLine="335" startOffset="8" endLine="371" endOffset="21"/></Target><Target id="@+id/iv_large_select" view="ImageView"><Expressions/><location startLine="361" startOffset="12" endLine="370" endOffset="50"/></Target><Target id="@+id/ll_font_super" view="FrameLayout"><Expressions/><location startLine="374" startOffset="8" endLine="410" endOffset="21"/></Target><Target id="@+id/iv_super_select" view="ImageView"><Expressions/><location startLine="400" startOffset="12" endLine="409" endOffset="50"/></Target><Target id="@+id/text_num" view="TextView"><Expressions/><location startLine="423" startOffset="4" endLine="433" endOffset="29"/></Target></Targets></Layout> <?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_edit" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_edit.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_edit_0" view="FrameLayout"><Expressions/><location startLine="17" startOffset="0" endLine="447" endOffset="13"/></Target><Target id="@+id/note_title" view="LinearLayout"><Expressions/><location startLine="28" startOffset="8" endLine="64" endOffset="22"/></Target><Target id="@+id/tv_modified_date" view="TextView"><Expressions/><location startLine="33" startOffset="12" endLine="40" endOffset="77"/></Target><Target id="@+id/iv_alert_icon" view="ImageView"><Expressions/><location startLine="42" startOffset="12" endLine="47" endOffset="60"/></Target><Target id="@+id/tv_alert_date" view="TextView"><Expressions/><location startLine="49" startOffset="12" endLine="56" endOffset="77"/></Target><Target id="@+id/sv_note_edit" view="LinearLayout"><Expressions/><location startLine="69" startOffset="8" endLine="131" endOffset="22"/></Target><Target id="@+id/button_play_audio" view="Button"><Expressions/><location startLine="80" startOffset="12" endLine="84" endOffset="37"/></Target><Target id="@+id/note_edit_view" view="net.micode.notes.ui.NoteEditText"><Expressions/><location startLine="100" startOffset="20" endLine="111" endOffset="53"/></Target><Target id="@+id/note_edit_list" view="LinearLayout"><Expressions/><location startLine="113" startOffset="20" endLine="119" endOffset="51"/></Target><Target id="@+id/btn_set_bg_color" view="ImageView"><Expressions/><location startLine="134" startOffset="4" endLine="139" endOffset="44"/></Target><Target id="@+id/note_bg_color_selector" view="LinearLayout"><Expressions/><location startLine="141" startOffset="4" endLine="253" endOffset="18"/></Target><Target id="@+id/iv_bg_yellow" view="ImageView"><Expressions/><location startLine="156" startOffset="12" endLine="159" endOffset="54"/></Target><Target id="@+id/iv_bg_yellow_select" view="ImageView"><Expressions/><location startLine="161" startOffset="12" endLine="169" endOffset="50"/></Target><Target id="@+id/iv_bg_blue" view="ImageView"><Expressions/><location startLine="177" startOffset="12" endLine="180" endOffset="54"/></Target><Target id="@+id/iv_bg_blue_select" view="ImageView"><Expressions/><location startLine="182" startOffset="12" endLine="190" endOffset="50"/></Target><Target id="@+id/iv_bg_white" view="ImageView"><Expressions/><location startLine="198" startOffset="12" endLine="201" endOffset="54"/></Target><Target id="@+id/iv_bg_white_select" view="ImageView"><Expressions/><location startLine="203" startOffset="12" endLine="211" endOffset="50"/></Target><Target id="@+id/iv_bg_green" view="ImageView"><Expressions/><location startLine="219" startOffset="12" endLine="222" endOffset="54"/></Target><Target id="@+id/iv_bg_green_select" view="ImageView"><Expressions/><location startLine="224" startOffset="12" endLine="231" endOffset="50"/></Target><Target id="@+id/iv_bg_red" view="ImageView"><Expressions/><location startLine="239" startOffset="12" endLine="242" endOffset="54"/></Target><Target id="@+id/iv_bg_red_select" view="ImageView"><Expressions/><location startLine="244" startOffset="12" endLine="251" endOffset="50"/></Target><Target id="@+id/font_size_selector" view="LinearLayout"><Expressions/><location startLine="256" startOffset="4" endLine="419" endOffset="18"/></Target><Target id="@+id/ll_font_small" view="FrameLayout"><Expressions/><location startLine="265" startOffset="8" endLine="301" endOffset="21"/></Target><Target id="@+id/iv_small_select" view="ImageView"><Expressions/><location startLine="291" startOffset="12" endLine="300" endOffset="50"/></Target><Target id="@+id/ll_font_normal" view="FrameLayout"><Expressions/><location startLine="304" startOffset="8" endLine="340" endOffset="21"/></Target><Target id="@+id/iv_medium_select" view="ImageView"><Expressions/><location startLine="330" startOffset="12" endLine="339" endOffset="50"/></Target><Target id="@+id/ll_font_large" view="FrameLayout"><Expressions/><location startLine="343" startOffset="8" endLine="379" endOffset="21"/></Target><Target id="@+id/iv_large_select" view="ImageView"><Expressions/><location startLine="369" startOffset="12" endLine="378" endOffset="50"/></Target><Target id="@+id/ll_font_super" view="FrameLayout"><Expressions/><location startLine="382" startOffset="8" endLine="418" endOffset="21"/></Target><Target id="@+id/iv_super_select" view="ImageView"><Expressions/><location startLine="408" startOffset="12" endLine="417" endOffset="50"/></Target><Target id="@+id/text_num" view="TextView"><Expressions/><location startLine="431" startOffset="4" endLine="441" endOffset="29"/></Target></Targets></Layout>

@ -5,277 +5,263 @@
5 android:versionName="1.0" > 5 android:versionName="1.0" >
6 6
7 <uses-sdk 7 <uses-sdk
7-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:8:5-44 7-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:8:5-44
8 android:minSdkVersion="16" 8 android:minSdkVersion="16"
8-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:8:15-41 8-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:8:15-41
9 android:targetSdkVersion="20" /> 9 android:targetSdkVersion="20" />
9-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:8:5-44 9-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:8:5-44
10 10
11 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 11 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
11-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:10:5-81 11-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:10:5-81
11-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:10:22-78 11-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:10:22-78
12 <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> 12 <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
12-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:11:5-88 12-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:11:5-88
12-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:11:22-85 12-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:11:22-85
13 <uses-permission android:name="android.permission.INTERNET" /> 13 <uses-permission android:name="android.permission.INTERNET" />
13-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:12:5-67 13-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:12:5-67
13-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:12:22-64 13-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:12:22-64
14 <uses-permission android:name="android.permission.READ_CONTACTS" /> 14 <uses-permission android:name="android.permission.READ_CONTACTS" />
14-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:13:5-72 14-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:13:5-72
14-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:13:22-69 14-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:13:22-69
15 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> 15 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
15-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:14:5-74 15-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:14:5-74
15-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:14:22-71 15-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:14:22-71
16 <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> 16 <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
16-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:15:5-80 16-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:15:5-80
16-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:15:22-77 16-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:15:22-77
17 <uses-permission android:name="android.permission.GET_ACCOUNTS" /> 17 <uses-permission android:name="android.permission.GET_ACCOUNTS" />
17-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:16:5-71 17-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:16:5-71
17-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:16:22-68 17-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:16:22-68
18 <uses-permission android:name="android.permission.USE_CREDENTIALS" /> 18 <uses-permission android:name="android.permission.USE_CREDENTIALS" />
18-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:17:5-74 18-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:17:5-74
18-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:17:22-71 18-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:17:22-71
19 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> 19 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
19-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:18:5-81 19-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:18:5-81
19-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:18:22-78 19-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:18:22-78
20 20
21 <application 21 <application
21-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:20:5-145:19 21-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:20:5-135:19
22 android:appComponentFactory="android.support.v4.app.CoreComponentFactory" 22 android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
22-->[com.android.support:support-compat:28.0.0] C:\Users\86136\.gradle\caches\transforms-3\192ad8f6a0f651ff9f10305663e68198\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 22-->[com.android.support:support-compat:28.0.0] C:\Users\15000\.gradle\caches\transforms-3\192ad8f6a0f651ff9f10305663e68198\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91
23 android:debuggable="true" 23 android:debuggable="true"
24 android:icon="@drawable/icon_app" 24 android:icon="@drawable/icon_app"
24-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:21:9-42 24-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:21:9-42
25 android:label="@string/app_name" 25 android:label="@string/app_name"
25-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:22:9-41 25-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:22:9-41
26 android:testOnly="true" > 26 android:testOnly="true" >
27 27 <activity
28 <!-- 其他声明 --> 27-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:24:9-33:20
29 <activity 28 android:name="net.micode.notes.ui.SplashActivity"
29-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:26:9-30:47 28-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:25:13-46
30 android:name="net.micode.notes.ui.ShowResultActivity" 29 android:configChanges="orientation|keyboardHidden|screenSize"
30-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:27:17-54 29-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:26:13-74
31 android:configChanges="orientation|keyboardHidden|screenSize" 30 android:theme="@style/Theme.Notes1.Fullscreen" >
31-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:28:17-78 30-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:27:13-59
32 android:label="Show Result" 31 <intent-filter>
32-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:30:17-44 31-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:28:13-32:29
33 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" /> 32 <action android:name="android.intent.action.MAIN" />
33-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:29:17-75 32-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:29:17-69
34 <!-- 其他声明 --> 32-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:29:25-66
35 33
36 <activity 34 <category android:name="android.intent.category.LAUNCHER" />
36-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:34:9-43:20 34-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:31:17-77
37 android:name="net.micode.notes.ui.SplashActivity" 34-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:31:27-74
37-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:35:13-46 35 </intent-filter>
38 android:configChanges="orientation|keyboardHidden|screenSize" 36 </activity>
38-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:36:13-74 37 <activity
39 android:theme="@style/Theme.Notes1.Fullscreen" > 37-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:34:9-41:64
39-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:37:13-59 38 android:name="net.micode.notes.ui.NotesListActivity"
40 <intent-filter> 38-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:35:13-49
40-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:38:13-42:29 39 android:configChanges="keyboardHidden|orientation|screenSize"
41 <action android:name="android.intent.action.MAIN" /> 39-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:36:13-74
41-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:39:17-69 40 android:label="@string/app_name"
41-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:39:25-66 40-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:37:13-45
42 41 android:launchMode="singleTop"
43 <category android:name="android.intent.category.LAUNCHER" /> 41-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:38:13-43
43-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:41:17-77 42 android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
43-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:41:27-74 42-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:39:13-71
44 </intent-filter> 43 android:uiOptions="splitActionBarWhenNarrow"
45 </activity> 43-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:40:13-57
46 <activity 44 android:windowSoftInputMode="adjustPan" />
46-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:44:9-51:64 44-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:41:13-52
47 android:name="net.micode.notes.ui.NotesListActivity" 45 <activity
47-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:45:13-49 45-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:42:9-75:20
48 android:configChanges="keyboardHidden|orientation|screenSize" 46 android:name="net.micode.notes.ui.NoteEditActivity"
48-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:46:13-74 46-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:43:13-48
49 android:label="@string/app_name" 47 android:configChanges="keyboardHidden|orientation|screenSize"
49-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:47:13-45 47-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:44:13-74
50 android:launchMode="singleTop" 48 android:launchMode="singleTop"
50-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:48:13-43 48-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:45:13-43
51 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" 49 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
51-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:49:13-71 49-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:46:13-71
52 android:uiOptions="splitActionBarWhenNarrow" 50
52-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:50:13-57 51 <!-- android:theme="@style/NoteTheme" -->
53 android:windowSoftInputMode="adjustPan" /> 52
53-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:51:13-52 53 <intent-filter>
54 <activity 53-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:50:13-57:29
54-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:52:9-85:20 54 <action android:name="android.intent.action.VIEW" />
55 android:name="net.micode.notes.ui.NoteEditActivity" 54-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:51:17-69
55-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:53:13-48 54-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:51:25-66
56 android:configChanges="keyboardHidden|orientation|screenSize" 55
56-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:54:13-74 56 <category android:name="android.intent.category.DEFAULT" />
57 android:launchMode="singleTop" 56-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:53:17-76
57-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:55:13-43 56-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:53:27-73
58 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" > 57
58-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:56:13-71 58 <data android:mimeType="vnd.android.cursor.item/text_note" />
59 58-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:55:17-78
60 <!-- android:theme="@style/NoteTheme" --> 58-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:55:23-75
61 59 <data android:mimeType="vnd.android.cursor.item/call_note" />
62 <intent-filter> 59-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:55:17-78
62-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:60:13-67:29 59-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:55:23-75
63 <action android:name="android.intent.action.VIEW" /> 60 </intent-filter>
63-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:61:17-69 61 <intent-filter>
63-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:61:25-66 61-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:58:13-65:29
64 62 <action android:name="android.intent.action.INSERT_OR_EDIT" />
65 <category android:name="android.intent.category.DEFAULT" /> 62-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:59:17-79
65-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:63:17-76 62-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:59:25-76
65-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:63:27-73 63
66 64 <category android:name="android.intent.category.DEFAULT" />
67 <data android:mimeType="vnd.android.cursor.item/text_note" /> 64-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:53:17-76
67-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:65:17-78 64-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:53:27-73
67-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:65:23-75 65
68 <data android:mimeType="vnd.android.cursor.item/call_note" /> 66 <data android:mimeType="vnd.android.cursor.item/text_note" />
68-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:65:17-78 66-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:55:17-78
68-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:65:23-75 66-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:55:23-75
69 </intent-filter> 67 <data android:mimeType="vnd.android.cursor.item/call_note" />
70 <intent-filter> 67-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:55:17-78
70-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:68:13-75:29 67-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:55:23-75
71 <action android:name="android.intent.action.INSERT_OR_EDIT" /> 68 </intent-filter>
71-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:69:17-79 69 <intent-filter>
71-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:69:25-76 69-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:66:13-70:29
72 70 <action android:name="android.intent.action.SEARCH" />
73 <category android:name="android.intent.category.DEFAULT" /> 70-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:67:17-71
73-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:63:17-76 70-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:67:25-68
73-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:63:27-73 71
72 <category android:name="android.intent.category.DEFAULT" />
72-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:53:17-76
72-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:53:27-73
73 </intent-filter>
74 74
75 <data android:mimeType="vnd.android.cursor.item/text_note" /> 75 <meta-data
75-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:65:17-78 75-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:72:13-74:54
75-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:65:23-75 76 android:name="android.app.searchable"
76 <data android:mimeType="vnd.android.cursor.item/call_note" /> 76-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:73:17-54
76-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:65:17-78 77 android:resource="@xml/searchable" />
76-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:65:23-75 77-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:74:17-51
77 </intent-filter> 78 </activity>
78 <intent-filter> 79
78-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:76:13-80:29 80 <provider
79 <action android:name="android.intent.action.SEARCH" /> 80-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:77:9-80:43
79-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:77:17-71 81 android:name="net.micode.notes.data.NotesProvider"
79-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:77:25-68 81-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:78:13-47
80 82 android:authorities="micode_notes"
81 <category android:name="android.intent.category.DEFAULT" /> 82-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:79:13-47
81-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:63:17-76 83 android:multiprocess="true" />
81-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:63:27-73 83-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:80:13-40
82 </intent-filter> 84
83 85 <receiver
84 <meta-data 85-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:82:9-94:20
84-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:82:13-84:54 86 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
85 android:name="android.app.searchable" 86-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:83:13-57
85-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:83:17-54 87 android:label="@string/app_widget2x2" >
86 android:resource="@xml/searchable" /> 87-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:84:13-50
86-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:84:17-51 88 <intent-filter>
87 </activity> 88-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:85:13-89:29
88 89 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
89 <provider 89-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:86:17-84
89-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:87:9-90:43 89-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:86:25-81
90 android:name="net.micode.notes.data.NotesProvider" 90 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
90-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:88:13-47 90-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:87:17-85
91 android:authorities="micode_notes" 90-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:87:25-82
91-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:89:13-47 91 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
92 android:multiprocess="true" /> 91-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:88:17-85
92-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:90:13-40 91-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:88:25-82
92 </intent-filter>
93 93
94 <receiver 94 <meta-data
94-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:92:9-104:20 94-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:91:13-93:58
95 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" 95 android:name="android.appwidget.provider"
95-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:93:13-57 95-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:92:17-58
96 android:label="@string/app_widget2x2" > 96 android:resource="@xml/widget_2x_info" />
96-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:94:13-50 96-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:93:17-55
97 <intent-filter> 97 </receiver>
97-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:95:13-99:29 98 <receiver
98 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> 98-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:95:9-107:20
98-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:96:17-84 99 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
98-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:96:25-81 99-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:96:13-57
99 <action android:name="android.appwidget.action.APPWIDGET_DELETED" /> 100 android:label="@string/app_widget4x4" >
99-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:97:17-85 100-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:97:13-50
99-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:97:25-82 101 <intent-filter>
100 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" /> 101-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:85:13-89:29
100-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:98:17-85 102 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
100-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:98:25-82 102-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:86:17-84
101 </intent-filter> 102-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:86:25-81
102 103 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
103 <meta-data 103-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:87:17-85
103-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:101:13-103:58 103-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:87:25-82
104 android:name="android.appwidget.provider" 104 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
104-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:102:17-58 104-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:88:17-85
105 android:resource="@xml/widget_2x_info" /> 104-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:88:25-82
105-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:103:17-55 105 </intent-filter>
106 </receiver> 106
107 <receiver 107 <meta-data
107-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:105:9-117:20 107-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:91:13-93:58
108 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" 108 android:name="android.appwidget.provider"
108-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:106:13-57 108-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:92:17-58
109 android:label="@string/app_widget4x4" > 109 android:resource="@xml/widget_4x_info" />
109-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:107:13-50 109-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:93:17-55
110 <intent-filter> 110 </receiver>
110-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:95:13-99:29 111 <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
111 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> 111-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:108:9-112:20
111-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:96:17-84 111-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:108:19-55
111-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:96:25-81 112 <intent-filter>
112 <action android:name="android.appwidget.action.APPWIDGET_DELETED" /> 112-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:109:13-111:29
112-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:97:17-85 113 <action android:name="android.intent.action.BOOT_COMPLETED" />
112-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:97:25-82 113-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:110:17-79
113 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" /> 113-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:110:25-76
113-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:98:17-85
113-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:98:25-82
114 </intent-filter> 114 </intent-filter>
115 115 </receiver>
116 <meta-data 116 <receiver
116-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:101:13-103:58 116-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:113:9-115:50
117 android:name="android.appwidget.provider" 117 android:name="net.micode.notes.ui.AlarmReceiver"
117-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:102:17-58 117-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:114:13-45
118 android:resource="@xml/widget_4x_info" /> 118 android:process=":remote" />
118-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:103:17-55 118-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:115:13-38
119 </receiver> 119
120 <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" > 120 <activity
120-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:118:9-122:20 120-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:117:9-121:87
120-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:118:19-55 121 android:name="net.micode.notes.ui.AlarmAlertActivity"
121 <intent-filter> 121-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:118:13-50
121-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:119:13-121:29 122 android:label="@string/app_name"
122 <action android:name="android.intent.action.BOOT_COMPLETED" /> 122-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:119:13-45
122-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:120:17-79 123 android:launchMode="singleInstance"
122-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:120:25-76 123-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:120:13-48
123 </intent-filter> 124 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
124 </receiver> 124-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:121:13-75
125 <receiver 125 <activity
125-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:123:9-125:50 125-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:122:9-126:72
126 android:name="net.micode.notes.ui.AlarmReceiver" 126 android:name="net.micode.notes.ui.NotesPreferenceActivity"
126-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:124:13-45 126-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:123:13-55
127 android:process=":remote" /> 127 android:label="@string/preferences_title"
127-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:125:13-38 127-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:124:13-54
128 128 android:launchMode="singleTop"
129 <activity 128-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:125:13-43
129-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:127:9-131:87 129 android:theme="@android:style/Theme.Holo.Light" />
130 android:name="net.micode.notes.ui.AlarmAlertActivity" 129-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:126:13-60
130-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:128:13-50 130
131 android:label="@string/app_name" 131 <service
131-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:129:13-45 131-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:128:9-130:48
132 android:launchMode="singleInstance" 132 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
132-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:130:13-48 132-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:129:13-58
133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> 133 android:exported="false" />
133-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:131:13-75 133-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:130:13-37
134 <activity 134
134-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:132:9-136:72 135 <meta-data
135 android:name="net.micode.notes.ui.NotesPreferenceActivity" 135-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:132:9-134:52
135-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:133:13-55 136 android:name="android.app.default_searchable"
136 android:label="@string/preferences_title" 136-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:133:13-58
136-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:134:13-54 137 android:value=".ui.NoteEditActivity" />
137 android:launchMode="singleTop" 137-->F:\Android_project\minotes\app\src\main\AndroidManifest.xml:134:13-49
137-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:135:13-43 138 </application>
138 android:theme="@android:style/Theme.Holo.Light" />
138-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:136:13-60
139 139
140 <service 140</manifest>
140-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:138:9-140:48
141 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
141-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:139:13-58
142 android:exported="false" />
142-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:140:13-37
143
144 <meta-data
144-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:142:9-144:52
145 android:name="android.app.default_searchable"
145-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:143:13-58
146 android:value=".ui.NoteEditActivity" />
146-->D:\Android\Projects\Notes1\app\src\main\AndroidManifest.xml:144:13-49
147 </application>
148
149</manifest>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save