add code annotation

HOJI 2 years ago
parent d5ad73a2f3
commit 30a533c574

Binary file not shown.

@ -7,11 +7,11 @@
<deviceKey> <deviceKey>
<Key> <Key>
<type value="VIRTUAL_DEVICE_PATH" /> <type value="VIRTUAL_DEVICE_PATH" />
<value value="E:\sdk\.android\avd\5.4_FWVGA_API_30.avd" /> <value value="C:\Users\HOJI\.android\avd\Pixel_4_API_28.avd" />
</Key> </Key>
</deviceKey> </deviceKey>
</Target> </Target>
</targetSelectedWithDropDown> </targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-04-28T06:03:02.403747700Z" /> <timeTargetWasSelectedWithDropDown value="2023-05-11T13:20:03.449034Z" />
</component> </component>
</project> </project>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java" charset="GBK" />
</component>
</project>

@ -2,11 +2,11 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/MiNotes.iml" filepath="$PROJECT_DIR$/.idea/modules/MiNotes.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/Mi_Note.iml" filepath="$PROJECT_DIR$/.idea/modules/Mi_Note.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/MiNotes.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/MiNotes.app.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Mi_Note.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Mi_Note.app.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/MiNotes.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/MiNotes.app.androidTest.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Mi_Note.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Mi_Note.app.androidTest.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/MiNotes.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/MiNotes.app.main.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Mi_Note.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Mi_Note.app.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/MiNotes.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/MiNotes.app.unitTest.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Mi_Note.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Mi_Note.app.unitTest.iml" />
</modules> </modules>
</component> </component>
</project> </project>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="MiNotes" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <module external.linked.project.id="Mi_Note" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$/../.."> <content url="file://$MODULE_DIR$/../..">

@ -27,7 +27,7 @@
<content url="file://$MODULE_DIR$/../../../app/src/androidTestDebug" /> <content url="file://$MODULE_DIR$/../../../app/src/androidTestDebug" />
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="MiNotes.app.main" scope="TEST" /> <orderEntry type="module" module-name="Mi_Note.app.main" scope="TEST" />
</component> </component>
<component name="TestModuleProperties" production-module="MiNotes.app.main" /> <component name="TestModuleProperties" production-module="Mi_Note.app.main" />
</module> </module>

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="MiNotes" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="Mi_Note" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager"> <component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle"> <facet type="android-gradle" name="Android-Gradle">
<configuration> <configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" /> <option name="GRADLE_PROJECT_PATH" value=":app" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="4.1.3" /> <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
<option name="LAST_KNOWN_AGP_VERSION" value="7.4.2" /> <option name="LAST_KNOWN_AGP_VERSION" value="7.4.2" />
</configuration> </configuration>
</facet> </facet>

@ -22,7 +22,7 @@
<content url="file://$MODULE_DIR$/../../../app/src/testDebug" /> <content url="file://$MODULE_DIR$/../../../app/src/testDebug" />
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="MiNotes.app.main" scope="TEST" /> <orderEntry type="module" module-name="Mi_Note.app.main" scope="TEST" />
</component> </component>
<component name="TestModuleProperties" production-module="MiNotes.app.main" /> <component name="TestModuleProperties" production-module="Mi_Note.app.main" />
</module> </module>

@ -2,5 +2,6 @@
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" /> <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component> </component>
</project> </project>

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

File diff suppressed because one or more lines are too long

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\git\MiNotes\app\src\main\assets"/><source path="F:\git\MiNotes\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\git\MiNotes\app\src\debug\assets"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\git\Mi_Note\app\src\main\assets"/><source path="F:\git\Mi_Note\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\git\Mi_Note\app\src\debug\assets"/></dataSet></merger>

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\git\MiNotes\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\git\MiNotes\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="F:\git\Mi_Note\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\git\Mi_Note\app\src\debug\jniLibs"/></dataSet></merger>

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\git\MiNotes\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\git\MiNotes\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="F:\git\Mi_Note\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\git\Mi_Note\app\src\debug\shaders"/></dataSet></merger>

@ -1,4 +1,4 @@
#Thu May 11 17:11:46 CST 2023 #Thu May 11 21:20:07 CST 2023
path.4=15/classes.dex path.4=15/classes.dex
path.3=13/classes.dex path.3=13/classes.dex
path.2=12/classes.dex path.2=12/classes.dex
@ -6,17 +6,17 @@ path.1=11/classes.dex
path.6=5/classes.dex path.6=5/classes.dex
path.5=4/classes.dex path.5=4/classes.dex
path.0=0/classes.dex path.0=0/classes.dex
base.4=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex base.4=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex
base.3=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex base.3=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex
base.2=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex base.2=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex
base.1=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex base.1=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
base.0=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex base.0=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
renamed.3=classes4.dex renamed.3=classes4.dex
renamed.2=classes3.dex renamed.2=classes3.dex
renamed.1=classes2.dex renamed.1=classes2.dex
renamed.0=classes.dex renamed.0=classes.dex
renamed.6=classes7.dex renamed.6=classes7.dex
renamed.5=classes6.dex renamed.5=classes6.dex
base.6=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex base.6=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex
renamed.4=classes5.dex renamed.4=classes5.dex
base.5=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex base.5=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex

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

@ -4,26 +4,7 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [ "map": [
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rCN\\strings.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": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": { "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", "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", "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",
@ -40,6 +21,25 @@
"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", "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" "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"
} }
},
{
"source": "F:\\git\\Mi_Note\\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"
}
} }
] ]
}, },
@ -47,7 +47,26 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
"map": [ "map": [
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\colors.xml", "source": "F:\\git\\Mi_Note\\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"
}
},
{
"source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\colors.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
@ -64,26 +83,24 @@
} }
}, },
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\arrays.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\dimens.xml",
"from": { "from": {
"startLines": "19,26", "startLines": "19,20,21,22,18",
"startColumns": "4,4", "startColumns": "4,4,4,4,4",
"startOffsets": "739,1047", "startOffsets": "764,816,869,922,712",
"endLines": "24,29", "endColumns": "51,52,52,51,51",
"endColumns": "19,19", "endOffsets": "811,864,917,969,759"
"endOffsets": "1041,1162"
}, },
"to": { "to": {
"startLines": "2,8", "startLines": "13,14,15,16,17",
"startColumns": "4,4", "startColumns": "4,4,4,4,4",
"startOffsets": "105,300", "startOffsets": "477,529,582,635,687",
"endLines": "7,11", "endColumns": "51,52,52,51,51",
"endColumns": "19,19", "endOffsets": "524,577,630,682,734"
"endOffsets": "295,415"
} }
}, },
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\strings.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\strings.xml",
"from": { "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", "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", "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",
@ -102,39 +119,22 @@
} }
}, },
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\styles.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\arrays.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"
}
},
{
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\dimens.xml",
"from": { "from": {
"startLines": "19,20,21,22,18", "startLines": "19,26",
"startColumns": "4,4,4,4,4", "startColumns": "4,4",
"startOffsets": "764,816,869,922,712", "startOffsets": "739,1047",
"endColumns": "51,52,52,51,51", "endLines": "24,29",
"endOffsets": "811,864,917,969,759" "endColumns": "19,19",
"endOffsets": "1041,1162"
}, },
"to": { "to": {
"startLines": "13,14,15,16,17", "startLines": "2,8",
"startColumns": "4,4,4,4,4", "startColumns": "4,4",
"startOffsets": "477,529,582,635,687", "startOffsets": "105,300",
"endColumns": "51,52,52,51,51", "endLines": "7,11",
"endOffsets": "524,577,630,682,734" "endColumns": "19,19",
"endOffsets": "295,415"
} }
} }
] ]
@ -143,7 +143,7 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [ "map": [
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": { "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", "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", "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",
@ -162,7 +162,7 @@
} }
}, },
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",

@ -4,26 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
"map": [ "map": [
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rCN\\strings.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": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": { "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", "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", "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",
@ -40,6 +21,25 @@
"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", "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" "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"
} }
},
{
"source": "F:\\git\\Mi_Note\\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"
}
} }
] ]
} }

@ -4,7 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
"map": [ "map": [
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": { "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", "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", "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",
@ -23,7 +23,7 @@
} }
}, },
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",

@ -4,7 +4,26 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
"map": [ "map": [
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\colors.xml", "source": "F:\\git\\Mi_Note\\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"
}
},
{
"source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\colors.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
"startColumns": "4", "startColumns": "4",
@ -21,26 +40,24 @@
} }
}, },
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\arrays.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\dimens.xml",
"from": { "from": {
"startLines": "19,26", "startLines": "19,20,21,22,18",
"startColumns": "4,4", "startColumns": "4,4,4,4,4",
"startOffsets": "739,1047", "startOffsets": "764,816,869,922,712",
"endLines": "24,29", "endColumns": "51,52,52,51,51",
"endColumns": "19,19", "endOffsets": "811,864,917,969,759"
"endOffsets": "1041,1162"
}, },
"to": { "to": {
"startLines": "2,8", "startLines": "13,14,15,16,17",
"startColumns": "4,4", "startColumns": "4,4,4,4,4",
"startOffsets": "105,300", "startOffsets": "477,529,582,635,687",
"endLines": "7,11", "endColumns": "51,52,52,51,51",
"endColumns": "19,19", "endOffsets": "524,577,630,682,734"
"endOffsets": "295,415"
} }
}, },
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\strings.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\strings.xml",
"from": { "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", "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", "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",
@ -59,39 +76,22 @@
} }
}, },
{ {
"source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\styles.xml", "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\arrays.xml",
"from": { "from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45", "startLines": "19,26",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4", "startColumns": "4,4",
"startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", "startOffsets": "739,1047",
"endLines": "53,58,67,62,25,29,33,38,43,21,48", "endLines": "24,29",
"endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endColumns": "19,19",
"endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" "endOffsets": "1041,1162"
},
"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"
}
},
{
"source": "F:\\git\\MiNotes\\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": { "to": {
"startLines": "13,14,15,16,17", "startLines": "2,8",
"startColumns": "4,4,4,4,4", "startColumns": "4,4",
"startOffsets": "477,529,582,635,687", "startOffsets": "105,300",
"endColumns": "51,52,52,51,51", "endLines": "7,11",
"endOffsets": "524,577,630,682,734" "endColumns": "19,19",
"endOffsets": "295,415"
} }
} }
] ]

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

Loading…
Cancel
Save