|
|
|
|
@ -9,163 +9,7 @@
|
|
|
|
|
<option name="autoReloadType" value="NONE" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="ea19e0d1-a6f3-43d3-b91b-61f1da6c5540" name="Changes" comment="">
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/../.gitkeep" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/.gitignore" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/deviceManager.xml" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/AndroidManifest.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/NOTICE" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/NOTICE" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Notes-master.iml" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/README" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/README" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/color/primary_text_dark.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/color/primary_text_dark.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/color/secondary_text_dark.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/color/secondary_text_dark.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/bg_btn_set_color.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/bg_color_btn_mask.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/call_record.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/call_record.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/clock.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/clock.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/delete.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/delete.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/dropdown_icon.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/edit_blue.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/edit_green.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/edit_red.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/edit_title_blue.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/edit_title_green.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/edit_title_red.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/edit_title_white.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/edit_title_yellow.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/edit_white.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/edit_yellow.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/font_large.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/font_large.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/font_normal.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/font_size_selector_bg.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/font_small.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/font_small.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/font_super.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/font_super.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/icon_app.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_background.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_background.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_blue_down.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_blue_middle.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_blue_single.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_blue_up.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_folder.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_footer_bg.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_green_down.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_green_middle.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_green_single.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_green_up.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_red_down.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_red_middle.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_red_single.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_red_up.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_white_down.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_white_middle.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_white_single.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_white_up.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_yellow_down.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_yellow_middle.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_yellow_single.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/list_yellow_up.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/menu_delete.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/menu_move.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/new_note_normal.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/new_note_pressed.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/note_edit_color_selector_panel.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/notification.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/notification.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/search_result.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/search_result.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/selected.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/selected.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/title_alert.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/title_alert.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/title_bar_bg.9.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/widget_2x_blue.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/widget_2x_green.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/widget_2x_red.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/widget_2x_white.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/widget_2x_yellow.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/widget_4x_blue.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/widget_4x_green.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/widget_4x_red.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/widget_4x_white.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable-hdpi/widget_4x_yellow.png" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/drawable/new_note.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/drawable/new_note.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/account_dialog_title.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/account_dialog_title.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/add_account_text.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/add_account_text.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/datetime_picker.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/datetime_picker.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/dialog_edit_text.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/dialog_edit_text.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/folder_list_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/folder_list_item.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/note_edit.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/note_edit.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/note_edit_list_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/note_edit_list_item.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/note_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/note_item.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/note_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/note_list.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/note_list_dropdown_menu.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/note_list_dropdown_menu.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/note_list_footer.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/note_list_footer.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/settings_header.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/settings_header.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/widget_2x.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/widget_2x.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/layout/widget_4x.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/layout/widget_4x.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/menu/call_note_edit.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/menu/call_note_edit.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/menu/call_record_folder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/menu/call_record_folder.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/menu/note_edit.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/menu/note_edit.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/menu/note_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/menu/note_list.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/menu/note_list_dropdown.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/menu/note_list_dropdown.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/menu/note_list_options.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/menu/note_list_options.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/menu/sub_folder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/menu/sub_folder.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/raw-zh-rCN/introduction" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/raw-zh-rCN/introduction" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/raw/introduction" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/raw/introduction" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/values-zh-rCN/arrays.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/values-zh-rCN/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/values-zh-rCN/strings.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/values-zh-rTW/arrays.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/values-zh-rTW/arrays.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/values-zh-rTW/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/values-zh-rTW/strings.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/values/arrays.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/values/arrays.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/values/colors.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/values/colors.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/values/dimens.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/values/dimens.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/values/strings.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/values/styles.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/values/styles.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/xml/preferences.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/xml/preferences.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/xml/searchable.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/xml/searchable.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/xml/widget_2x_info.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/xml/widget_2x_info.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/res/xml/widget_4x_info.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/res/xml/widget_4x_info.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/data/Contact.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/data/Contact.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/data/Notes.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/data/Notes.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/data/NotesDatabaseHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/data/NotesDatabaseHelper.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/data/NotesProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/data/NotesProvider.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/data/MetaData.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/data/MetaData.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/data/Node.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/data/Node.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/data/SqlData.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/data/SqlData.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/data/SqlNote.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/data/SqlNote.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/data/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/data/Task.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/data/TaskList.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/data/TaskList.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/exception/ActionFailureException.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/exception/ActionFailureException.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/exception/NetworkFailureException.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/exception/NetworkFailureException.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/remote/GTaskASyncTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/remote/GTaskASyncTask.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/remote/GTaskClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/remote/GTaskClient.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/remote/GTaskManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/remote/GTaskManager.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/gtask/remote/GTaskSyncService.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/gtask/remote/GTaskSyncService.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/model/Note.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/model/Note.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/model/WorkingNote.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/model/WorkingNote.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/tool/BackupUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/tool/BackupUtils.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/tool/DataUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/tool/DataUtils.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/tool/GTaskStringUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/tool/GTaskStringUtils.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/tool/ResourceParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/tool/ResourceParser.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/AlarmAlertActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/AlarmAlertActivity.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/AlarmInitReceiver.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/AlarmInitReceiver.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/AlarmReceiver.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/AlarmReceiver.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/DateTimePicker.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/DateTimePicker.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/DateTimePickerDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/DateTimePickerDialog.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/DropdownMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/DropdownMenu.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/FoldersListAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/FoldersListAdapter.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/NoteEditActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/NoteEditActivity.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/NoteEditText.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/NoteEditText.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/NoteItemData.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/NoteItemData.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/NotesListActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/NotesListActivity.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/NotesListAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/NotesListAdapter.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/NotesListItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/NotesListItem.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/ui/NotesPreferenceActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/ui/NotesPreferenceActivity.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/widget/NoteWidgetProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/widget/NoteWidgetProvider.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/widget/NoteWidgetProvider_2x.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/widget/NoteWidgetProvider_2x.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/net/micode/notes/widget/NoteWidgetProvider_4x.java" beforeDir="false" afterPath="$PROJECT_DIR$/Notes-master/app/src/main/java/notes/widget/NoteWidgetProvider_4x.java" afterDir="false" />
|
|
|
|
|
</list>
|
|
|
|
|
<list default="true" id="ea19e0d1-a6f3-43d3-b91b-61f1da6c5540" name="Changes" comment="" />
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
|
|
|