AlarmAlertActivity注释

c_master
yijunchao 2 years ago
parent 05ed504026
commit b8c45c143d

@ -1,3 +1,3 @@
# 默认忽略的文件
# Default ignored files
/shelf/
/workspace.xml

@ -1,3 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
</GradleProjectSettings>
</option>
</component>
</project>

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>

@ -1,15 +1,13 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 33
compileSdkVersion 23
buildToolsVersion "25.0.1"
aaptOptions.cruncherEnabled = false
aaptOptions.useNewCruncher = false
useLibrary 'org.apache.http.legacy'
defaultConfig {
applicationId "net.micode.notes"
minSdkVersion 14
targetSdkVersion 33
targetSdkVersion 14
}
buildTypes {
@ -18,5 +16,5 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
android{ useLibrary 'org.apache.http.legacy' }
// android{ useLibrary 'org.apache.http.legacy' }
}

@ -1,6 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< remotes/origin/c_master
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\assets"/><source path="D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\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="D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\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="E:\MiNotes-master\app\src\main\assets"/><source path="E:\MiNotes-master\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="E:\MiNotes-master\app\src\debug\assets"/></dataSet></merger>
>>>>>>> local
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\MiNotes\MiNotes-master2\app\src\main\assets"/><source path="E:\MiNotes\MiNotes-master2\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="E:\MiNotes\MiNotes-master2\app\src\debug\assets"/></dataSet></merger>

@ -1,6 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< remotes/origin/c_master
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\debug\jniLibs"/></dataSet></merger>
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\MiNotes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\MiNotes-master\app\src\debug\jniLibs"/></dataSet></merger>
>>>>>>> local
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\MiNotes\MiNotes-master2\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\MiNotes\MiNotes-master2\app\src\debug\jniLibs"/></dataSet></merger>

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

@ -1,6 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< remotes/origin/c_master
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\IDEA\AndroidModeCode\MiNotes_master\MiNotes-master\app\src\debug\shaders"/></dataSet></merger>
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\MiNotes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\MiNotes-master\app\src\debug\shaders"/></dataSet></merger>
>>>>>>> local
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\MiNotes\MiNotes-master2\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\MiNotes\MiNotes-master2\app\src\debug\shaders"/></dataSet></merger>

@ -1,9 +1,4 @@
<<<<<<< remotes/origin/c_master
#Tue Mar 14 21:23:28 CST 2023
base.0=D\:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
=======
#Wed Mar 15 08:45:50 CST 2023
base.0=E\:\\MiNotes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> local
#Fri Apr 14 19:30:33 CST 2023
base.0=E\:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
renamed.0=classes.dex
path.0=classes.dex

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

@ -21,7 +21,7 @@
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="33" />
android:targetSdkVersion="14" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

@ -21,7 +21,7 @@
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="33" />
android:targetSdkVersion="14" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

@ -1,40 +1,10 @@
{
"logs": [
{
<<<<<<< remotes/origin/c_master
"outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
"outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
=======
"outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
>>>>>>> local
"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"
}
},
{
<<<<<<< remotes/origin/c_master
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
=======
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
>>>>>>> local
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@ -51,15 +21,9 @@
"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"
}
}
]
},
{
<<<<<<< remotes/origin/c_master
"outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
},
{
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@ -76,73 +40,14 @@
"endColumns": "19",
"endOffsets": "210"
}
},
{
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
}
}
]
},
{
"outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat",
"map": [
{
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
"startOffsets": "764,816,869,922,712",
"endColumns": "51,52,52,51,51",
"endOffsets": "811,864,917,969,759"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "589,641,694,747,799",
"endColumns": "51,52,52,51,51",
"endOffsets": "636,689,742,794,846"
}
},
{
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
"startOffsets": "712",
"endColumns": "56",
"endOffsets": "764"
},
"to": {
"startLines": "12",
"startColumns": "4",
"startOffsets": "532",
"endColumns": "56",
"endOffsets": "584"
}
},
{
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\strings.xml",
=======
"outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat",
"outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat",
"map": [
{
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\strings.xml",
>>>>>>> local
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@ -161,10 +66,7 @@
}
},
{
<<<<<<< remotes/origin/c_master
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\styles.xml",
=======
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\colors.xml",
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@ -181,27 +83,7 @@
}
},
{
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "19,26",
"startColumns": "4,4",
"startOffsets": "739,1047",
"endLines": "24,29",
"endColumns": "19,19",
"endOffsets": "1041,1162"
},
"to": {
"startLines": "2,8",
"startColumns": "4,4",
"startOffsets": "105,412",
"endLines": "7,11",
"endColumns": "19,19",
"endOffsets": "407,527"
}
},
{
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\styles.xml",
>>>>>>> local
"source": "E:\\MiNotes\\MiNotes-master2\\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",
@ -220,11 +102,26 @@
}
},
{
<<<<<<< remotes/origin/c_master
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\arrays.xml",
=======
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\dimens.xml",
>>>>>>> local
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "19,26",
"startColumns": "4,4",
"startOffsets": "739,1047",
"endLines": "24,29",
"endColumns": "19,19",
"endOffsets": "1041,1162"
},
"to": {
"startLines": "2,8",
"startColumns": "4,4",
"startOffsets": "105,412",
"endLines": "7,11",
"endColumns": "19,19",
"endOffsets": "407,527"
}
},
{
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
@ -241,14 +138,12 @@
}
}
]
<<<<<<< remotes/origin/c_master
=======
},
{
"outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
"outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [
{
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@ -267,7 +162,7 @@
}
},
{
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@ -286,7 +181,6 @@
}
}
]
>>>>>>> local
}
]
}

@ -1,17 +1,29 @@
{
"logs": [
{
<<<<<<< remotes/origin/c_master
"outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
"outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
"map": [
{
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
=======
"outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
"map": [
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
}
},
{
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
>>>>>>> local
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@ -28,29 +40,6 @@
"endColumns": "19",
"endOffsets": "210"
}
},
{
<<<<<<< remotes/origin/c_master
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
=======
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
>>>>>>> local
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
}
}
]
}

@ -1,17 +1,10 @@
{
"logs": [
{
<<<<<<< remotes/origin/c_master
"outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
"outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
"map": [
{
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
=======
"outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
"map": [
{
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
>>>>>>> local
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@ -30,11 +23,7 @@
}
},
{
<<<<<<< remotes/origin/c_master
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
=======
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
>>>>>>> local
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",

@ -1,51 +1,10 @@
{
"logs": [
{
<<<<<<< remotes/origin/c_master
"outputFile": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
"outputFile": "E:\\MiNotes\\MiNotes-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
"map": [
{
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
"startOffsets": "764,816,869,922,712",
"endColumns": "51,52,52,51,51",
"endOffsets": "811,864,917,969,759"
},
"to": {
"startLines": "13,14,15,16,17",
"startColumns": "4,4,4,4,4",
"startOffsets": "589,641,694,747,799",
"endColumns": "51,52,52,51,51",
"endOffsets": "636,689,742,794,846"
}
},
{
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
"startOffsets": "712",
"endColumns": "56",
"endOffsets": "764"
},
"to": {
"startLines": "12",
"startColumns": "4",
"startOffsets": "532",
"endColumns": "56",
"endOffsets": "584"
}
},
{
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\strings.xml",
=======
"outputFile": "E:\\MiNotes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
"map": [
{
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\strings.xml",
>>>>>>> local
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@ -64,10 +23,7 @@
}
},
{
<<<<<<< remotes/origin/c_master
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\styles.xml",
=======
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\colors.xml",
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@ -84,27 +40,7 @@
}
},
{
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "19,26",
"startColumns": "4,4",
"startOffsets": "739,1047",
"endLines": "24,29",
"endColumns": "19,19",
"endOffsets": "1041,1162"
},
"to": {
"startLines": "2,8",
"startColumns": "4,4",
"startOffsets": "105,412",
"endLines": "7,11",
"endColumns": "19,19",
"endOffsets": "407,527"
}
},
{
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\styles.xml",
>>>>>>> local
"source": "E:\\MiNotes\\MiNotes-master2\\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",
@ -123,11 +59,26 @@
}
},
{
<<<<<<< remotes/origin/c_master
"source": "D:\\IDEA\\AndroidModeCode\\MiNotes_master\\MiNotes-master\\app\\src\\main\\res\\values\\arrays.xml",
=======
"source": "E:\\MiNotes-master\\app\\src\\main\\res\\values\\dimens.xml",
>>>>>>> local
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "19,26",
"startColumns": "4,4",
"startOffsets": "739,1047",
"endLines": "24,29",
"endColumns": "19,19",
"endOffsets": "1041,1162"
},
"to": {
"startLines": "2,8",
"startColumns": "4,4",
"startOffsets": "105,412",
"endLines": "7,11",
"endColumns": "19,19",
"endOffsets": "407,527"
}
},
{
"source": "E:\\MiNotes\\MiNotes-master2\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",

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

@ -21,7 +21,7 @@
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="33" />
android:targetSdkVersion="14" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

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

Loading…
Cancel
Save