xiaminghui_branch
huige 2 years ago
commit ac1e4bf13c

@ -7,11 +7,19 @@
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<<<<<<< HEAD
<value value="C:\Users\86152\.android\avd\Pixel_3a_API_34_extension_level_7_x86_64.avd" />
=======
<value value="C:\Users\huigenb\.android\avd\Pixel_3a_API_34.avd" />
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<<<<<<< HEAD
<timeTargetWasSelectedWithDropDown value="2023-11-06T12:00:46.138519600Z" />
=======
<timeTargetWasSelectedWithDropDown value="2023-12-08T16:45:36.991735100Z" />
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
</component>
</project>

@ -2,11 +2,18 @@ apply plugin: 'com.android.application'
android {
namespace "net.micode.notes"
<<<<<<< HEAD
compileSdkVersion 22
buildToolsVersion "34.0.0"
useLibrary'org.apache.http.legacy'
=======
compileSdk 34
buildToolsVersion "34.0.0"
useLibrary'org.apache.http.legacy'
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
defaultConfig {
applicationId "net.micode.notes"
targetSdkVersion 14

@ -0,0 +1,2 @@
#- File Locator -
listingFile=../../../outputs/apk/androidTest/debug/output-metadata.json

@ -1,3 +1,4 @@
<<<<<<< HEAD
#Mon Nov 06 20:07:48 CST 2023
net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
@ -94,3 +95,101 @@ net.micode.notes.app-main-6\:/xml/preferences.xml=C\:\\Users\\86152\\Desktop\\Ta
net.micode.notes.app-main-6\:/xml/searchable.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
=======
#Sat Dec 09 00:14:06 CST 2023
net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
net.micode.notes.app-main-6\:/drawable/new_note.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
net.micode.notes.app-main-6\:/layout/add_account_text.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
net.micode.notes.app-main-6\:/layout/datetime_picker.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
net.micode.notes.app-main-6\:/layout/folder_list_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
net.micode.notes.app-main-6\:/layout/note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
net.micode.notes.app-main-6\:/layout/note_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
net.micode.notes.app-main-6\:/layout/note_list.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
net.micode.notes.app-main-6\:/layout/note_list_footer.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
net.micode.notes.app-main-6\:/layout/settings_header.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
net.micode.notes.app-main-6\:/layout/widget_2x.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
net.micode.notes.app-main-6\:/layout/widget_4x.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
net.micode.notes.app-main-6\:/menu/call_note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
net.micode.notes.app-main-6\:/menu/call_record_folder.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
net.micode.notes.app-main-6\:/menu/note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
net.micode.notes.app-main-6\:/menu/note_list.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
net.micode.notes.app-main-6\:/menu/note_list_options.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
net.micode.notes.app-main-6\:/menu/sub_folder.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
net.micode.notes.app-main-6\:/raw/introduction=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
net.micode.notes.app-main-6\:/xml/preferences.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
net.micode.notes.app-main-6\:/xml/searchable.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241

@ -133,7 +133,11 @@
</style>
<style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
<item name="android:displayOptions"/>
<<<<<<< HEAD
<item name="android:visibility">gone</item>
=======
<item name="android:visibility">visible</item>
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
</style>
<style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
<item name="android:actionBarStyle">@style/NoteActionBarStyle</item>

File diff suppressed because one or more lines are too long

@ -1,3 +1,4 @@
<<<<<<< HEAD
#Mon Nov 06 20:07:49 CST 2023
net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
@ -94,3 +95,101 @@ net.micode.notes.app-main-5\:/xml/preferences.xml=C\:\\Users\\86152\\Desktop\\Ta
net.micode.notes.app-main-5\:/xml/searchable.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
=======
#Sat Dec 09 00:14:06 CST 2023
net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
net.micode.notes.app-main-5\:/drawable/new_note.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
net.micode.notes.app-main-5\:/layout/add_account_text.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
net.micode.notes.app-main-5\:/layout/datetime_picker.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
net.micode.notes.app-main-5\:/layout/folder_list_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
net.micode.notes.app-main-5\:/layout/note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
net.micode.notes.app-main-5\:/layout/note_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
net.micode.notes.app-main-5\:/layout/note_list.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
net.micode.notes.app-main-5\:/layout/note_list_footer.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
net.micode.notes.app-main-5\:/layout/settings_header.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
net.micode.notes.app-main-5\:/layout/widget_2x.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
net.micode.notes.app-main-5\:/layout/widget_4x.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
net.micode.notes.app-main-5\:/menu/call_note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
net.micode.notes.app-main-5\:/menu/call_record_folder.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
net.micode.notes.app-main-5\:/menu/note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
net.micode.notes.app-main-5\:/menu/note_list.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
net.micode.notes.app-main-5\:/menu/note_list_options.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
net.micode.notes.app-main-5\:/menu/sub_folder.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
net.micode.notes.app-main-5\:/raw/introduction=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
net.micode.notes.app-main-5\:/xml/preferences.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
net.micode.notes.app-main-5\:/xml/searchable.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241

@ -133,7 +133,11 @@
</style>
<style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
<item name="android:displayOptions"/>
<<<<<<< HEAD
<item name="android:visibility">gone</item>
=======
<item name="android:visibility">visible</item>
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
</style>
<style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
<item name="android:actionBarStyle">@style/NoteActionBarStyle</item>

File diff suppressed because one or more lines are too long

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>

@ -1,2 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86152\Desktop\Tasks\software\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet></merger>
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet></merger>
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241

@ -1,2 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\debug\jniLibs"/></dataSet></merger>
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\debug\jniLibs"/></dataSet></merger>
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241

@ -1,2 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\debug\shaders"/></dataSet></merger>
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\debug\shaders"/></dataSet></merger>
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241

@ -1,4 +1,9 @@
<<<<<<< HEAD
#Mon Nov 06 20:07:52 CST 2023
base.0=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
=======
#Sat Dec 09 23:27:08 CST 2023
base.0=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
path.0=classes.dex
renamed.0=classes.dex

@ -0,0 +1,4 @@
#Sat Dec 09 00:54:38 CST 2023
base.0=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
path.0=classes.dex
renamed.0=classes.dex

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

@ -0,0 +1,32 @@
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="net.micode.notes.test" >
4
5 <uses-sdk
5-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:5:5-73
6 android:minSdkVersion="1"
6-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:5:15-40
7 android:targetSdkVersion="14" />
7-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:5:41-70
8
9 <instrumentation
9-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:11:5-15:66
10 android:name="android.test.InstrumentationTestRunner"
10-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:11:22-75
11 android:functionalTest="false"
11-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:14:22-52
12 android:handleProfiling="false"
12-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:13:22-53
13 android:label="Tests for net.micode.notes"
13-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:15:22-64
14 android:targetPackage="net.micode.notes" />
14-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:12:22-62
15
16 <application android:debuggable="true" >
16-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:7:5-9:19
17 <uses-library android:name="android.test.runner" />
17-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:8:9-60
17-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:8:23-57
18 </application>
19
20</manifest>

@ -44,7 +44,10 @@
android:label="@string/app_name"
android:launchMode="singleTop"
android:theme="@style/NoteTheme"
<<<<<<< HEAD
android:uiOptions="splitActionBarWhenNarrow"
=======
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
android:windowSoftInputMode="adjustPan" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

@ -44,7 +44,10 @@
android:label="@string/app_name"
android:launchMode="singleTop"
android:theme="@style/NoteTheme"
<<<<<<< HEAD
android:uiOptions="splitActionBarWhenNarrow"
=======
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
android:windowSoftInputMode="adjustPan" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

@ -1,10 +1,17 @@
{
"logs": [
{
<<<<<<< HEAD
"outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
"source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
=======
"outputFile": "C:\\Users\\huigenb\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
"from": {
"startLines": "18",
"startColumns": "4",
@ -23,6 +30,7 @@
}
},
{
<<<<<<< HEAD
"source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
@ -163,6 +171,9 @@
},
{
"source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
=======
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
"from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@ -181,6 +192,234 @@
}
}
]
<<<<<<< HEAD
=======
},
{
"outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
"map": [
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "-1",
"startColumns": "-1",
"startOffsets": "-1"
},
"to": {
"startLines": "12",
"startColumns": "4",
"startOffsets": "420",
"endColumns": "56",
"endOffsets": "472"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "-1,-1",
"startColumns": "-1,-1",
"startOffsets": "-1,-1"
},
"to": {
"startLines": "2,8",
"startColumns": "4,4",
"startOffsets": "105,300",
"endLines": "7,11",
"endColumns": "19,19",
"endOffsets": "295,415"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
"startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
"endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1",
"endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
"startLines": "125,129,133,137,140,144,148,152,156,160,164",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
"endLines": "128,132,136,139,143,147,151,155,159,163,167",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
}
}
]
},
{
"outputFile": "C:\\Users\\huigenb\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat",
"map": [
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
"startOffsets": "712",
"endColumns": "56",
"endOffsets": "764"
},
"to": {
"startLines": "12",
"startColumns": "4",
"startOffsets": "420",
"endColumns": "56",
"endOffsets": "472"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
"startOffsets": "764,816,869,922,712",
"endColumns": "51,52,52,51,51",
"endOffsets": "811,864,917,969,759"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "19,26",
"startColumns": "4,4",
"startOffsets": "739,1047",
"endLines": "24,29",
"endColumns": "19,19",
"endOffsets": "1041,1162"
},
"to": {
"startLines": "2,8",
"startColumns": "4,4",
"startOffsets": "105,300",
"endLines": "7,11",
"endColumns": "19,19",
"endOffsets": "295,415"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
"endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
},
"to": {
"startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
"endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
"endLines": "53,58,67,62,25,29,33,38,43,21,48",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
},
"to": {
"startLines": "125,129,133,137,140,144,148,152,156,160,164",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
"endLines": "128,132,136,139,143,147,151,155,159,163,167",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
}
}
]
},
{
"outputFile": "C:\\Users\\huigenb\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
"startOffsets": "712",
"endLines": "21",
"endColumns": "19",
"endOffsets": "817"
},
"to": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "105",
"endLines": "5",
"endColumns": "19",
"endOffsets": "210"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
}
}
]
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
}
]
}

@ -4,7 +4,11 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
=======
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
"from": {
"startLines": "18",
"startColumns": "4",
@ -23,7 +27,11 @@
}
},
{
<<<<<<< HEAD
"source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
=======
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",

@ -4,7 +4,11 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
=======
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
"from": {
"startLines": "18",
"startColumns": "4",
@ -23,7 +27,11 @@
}
},
{
<<<<<<< HEAD
"source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
=======
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
"from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",

@ -4,6 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45",
@ -12,10 +13,83 @@
"endLines": "53,58,67,62,25,29,33,38,43,21,48",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
=======
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "-1",
"startColumns": "-1",
"startOffsets": "-1"
},
"to": {
"startLines": "12",
"startColumns": "4",
"startOffsets": "420",
"endColumns": "56",
"endOffsets": "472"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "-1,-1",
"startColumns": "-1,-1",
"startOffsets": "-1,-1"
},
"to": {
"startLines": "2,8",
"startColumns": "4,4",
"startOffsets": "105,300",
"endLines": "7,11",
"endColumns": "19,19",
"endOffsets": "295,415"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
"startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
"endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1",
"endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1"
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
},
"to": {
"startLines": "125,129,133,137,140,144,148,152,156,160,164",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
<<<<<<< HEAD
"startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
"endLines": "128,132,136,139,143,147,151,155,159,163,167",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
@ -24,6 +98,55 @@
},
{
"source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
=======
"startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
"endLines": "128,132,136,139,143,147,151,155,159,163,167",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
}
}
]
},
{
"outputFile": "C:\\Users\\huigenb\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-2:\\values\\values.xml",
"map": [
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
"startOffsets": "712",
"endColumns": "56",
"endOffsets": "764"
},
"to": {
"startLines": "12",
"startColumns": "4",
"startOffsets": "420",
"endColumns": "56",
"endOffsets": "472"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
"startOffsets": "764,816,869,922,712",
"endColumns": "51,52,52,51,51",
"endOffsets": "811,864,917,969,759"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734"
}
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
"from": {
"startLines": "19,26",
"startColumns": "4,4",
@ -42,6 +165,7 @@
}
},
{
<<<<<<< HEAD
"source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
@ -77,6 +201,9 @@
},
{
"source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
=======
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
"from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@ -93,6 +220,28 @@
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
}
<<<<<<< HEAD
=======
},
{
"source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
"endLines": "53,58,67,62,25,29,33,38,43,21,48",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
},
"to": {
"startLines": "125,129,133,137,140,144,148,152,156,160,164",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
"endLines": "128,132,136,139,143,147,151,155,159,163,167",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
}
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
}
]
}

@ -44,7 +44,10 @@
android:label="@string/app_name"
android:launchMode="singleTop"
android:theme="@style/NoteTheme"
<<<<<<< HEAD
android:uiOptions="splitActionBarWhenNarrow"
=======
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
android:windowSoftInputMode="adjustPan" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.micode.notes.test" >
<uses-sdk
android:minSdkVersion="1"
android:targetSdkVersion="14" />
<instrumentation
android:name="android.test.InstrumentationTestRunner"
android:functionalTest="false"
android:handleProfiling="false"
android:label="Tests for net.micode.notes"
android:targetPackage="net.micode.notes" />
<application android:debuggable="true" >
<uses-library android:name="android.test.runner" />
</application>
</manifest>

@ -0,0 +1,18 @@
{
"version": 3,
"artifactType": {
"type": "PACKAGED_MANIFESTS",
"kind": "Directory"
},
"applicationId": "net.micode.notes.test",
"variantName": "debugAndroidTest",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"outputFile": "AndroidManifest.xml"
}
],
"elementType": "File"
}

@ -133,7 +133,11 @@
</style>
<style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
<item name="android:displayOptions"/>
<<<<<<< HEAD
<item name="android:visibility">gone</item>
=======
<item name="android:visibility">visible</item>
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241
</style>
<style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
<item name="android:actionBarStyle">@style/NoteActionBarStyle</item>

@ -0,0 +1,20 @@
{
"version": 3,
"artifactType": {
"type": "PROCESSED_RES",
"kind": "Directory"
},
"applicationId": "net.micode.notes.test",
"variantName": "debugAndroidTest",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 0,
"versionName": "",
"outputFile": "resources-debugAndroidTest.ap_"
}
],
"elementType": "File"
}

@ -1 +1,5 @@
<<<<<<< HEAD
{"enableV1Signing":true,"enableV2Signing":false,"enableV3Signing":false,"enableV4Signing":false}
=======
{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241

@ -0,0 +1 @@
{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}

@ -1,3 +1,4 @@
<<<<<<< HEAD
net.micode.notes.app-pngs-0 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\build\generated\res\pngs\debug
net.micode.notes.app-resValues-1 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\build\generated\res\resValues\debug
net.micode.notes.app-packageDebugResources-2 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
@ -5,3 +6,12 @@ net.micode.notes.app-packageDebugResources-3 C:\Users\86152\Desktop\Tasks\softwa
net.micode.notes.app-merged_res-4 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\build\intermediates\merged_res\debug
net.micode.notes.app-debug-5 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\debug\res
net.micode.notes.app-main-6 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\res
=======
net.micode.notes.app-pngs-0 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\generated\res\pngs\debug
net.micode.notes.app-resValues-1 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\generated\res\resValues\debug
net.micode.notes.app-packageDebugResources-2 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
net.micode.notes.app-packageDebugResources-3 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir
net.micode.notes.app-merged_res-4 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\merged_res\debug
net.micode.notes.app-debug-5 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\debug\res
net.micode.notes.app-main-6 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\res
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241

@ -0,0 +1,4 @@
net.micode.notes.test.app-androidTest-0 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\generated\res\resValues\androidTest\debug
net.micode.notes.test.app-mergeDebugAndroidTestResources-1 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
net.micode.notes.test.app-mergeDebugAndroidTestResources-2 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
net.micode.notes.test.app-merged_res-3 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\merged_res\debugAndroidTest

@ -0,0 +1,20 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "net.micode.notes.test",
"variantName": "debugAndroidTest",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 0,
"versionName": "",
"outputFile": "app-debug-androidTest.apk"
}
],
"elementType": "File"
}

@ -1,5 +1,6 @@
-- Merging decision tree log ---
manifest
<<<<<<< HEAD
ADDED from C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
INJECTED from C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
@ -233,3 +234,236 @@ ADDED from C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\Andro
ADDED from C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
android:name
ADDED from C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
=======
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
package
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml
android:versionName
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:21:5-30
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml
xmlns:android
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:11-69
android:versionCode
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:20:5-28
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml
uses-sdk
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
android:targetSdkVersion
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml
android:minSdkVersion
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
uses-permission#android.permission.INTERNET
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
uses-permission#android.permission.READ_CONTACTS
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
uses-permission#android.permission.MANAGE_ACCOUNTS
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
uses-permission#android.permission.GET_ACCOUNTS
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
uses-permission#android.permission.USE_CREDENTIALS
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
application
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
android:label
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
android:icon
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
activity#net.micode.notes.ui.NotesListActivity
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
android:label
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
android:launchMode
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
android:windowSoftInputMode
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
android:configChanges
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
android:theme
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
action#android.intent.action.MAIN
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
category#android.intent.category.LAUNCHER
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
activity#net.micode.notes.ui.NoteEditActivity
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20
android:launchMode
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:55:13-43
android:configChanges
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
android:theme
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:56:13-45
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:53:13-48
intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29
action#android.intent.action.VIEW
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:59:17-69
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:59:25-66
category#android.intent.category.DEFAULT
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
data
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
android:mimeType
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29
action#android.intent.action.INSERT_OR_EDIT
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:66:17-79
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:66:25-76
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29
action#android.intent.action.SEARCH
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:73:17-71
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:73:25-68
meta-data#android.app.searchable
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54
android:resource
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:79:17-51
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:78:17-54
provider#net.micode.notes.data.NotesProvider
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43
android:authorities
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:84:13-47
android:multiprocess
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:85:13-40
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:83:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20
android:label
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:89:13-50
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:88:13-57
intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
action#android.appwidget.action.APPWIDGET_UPDATE
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
action#android.appwidget.action.APPWIDGET_DELETED
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
action#android.intent.action.PRIVACY_MODE_CHANGED
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
meta-data#android.appwidget.provider
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
android:resource
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20
android:label
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:102:13-50
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:101:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:115:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29
action#android.intent.action.BOOT_COMPLETED
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:117:17-79
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:117:25-76
receiver#net.micode.notes.ui.AlarmReceiver
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20
android:process
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:123:13-38
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:122:13-61
activity#net.micode.notes.ui.AlarmAlertActivity
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20
android:label
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:128:13-45
android:launchMode
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:129:13-48
android:theme
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:130:13-75
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:127:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20
android:label
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:135:13-54
android:launchMode
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:136:13-43
android:theme
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:137:13-60
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
android:exported
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
meta-data#android.app.default_searchable
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
android:value
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
android:name
ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
>>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241

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

Loading…
Cancel
Save