Merge branch 'master' of https://bdgit.educoder.net/mvbayc8qt/new_MiCode
# Conflicts: # src/.gradle/7.3.3/executionHistory/executionHistory.bin # src/.gradle/7.3.3/executionHistory/executionHistory.lock # src/.gradle/7.3.3/fileHashes/fileHashes.bin # src/.gradle/7.3.3/fileHashes/fileHashes.lock # src/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/.gradle/file-system.probe # src/.idea/workspace.xml # src/Notes1/app/build/intermediates/merged_res/debug/values_values.arsc.flat # src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json # src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json # src/Notes1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex # src/Notes1/app/src/main/res/values/strings.xml # src/Notes1/app/src/main/res/values/styles.xml # src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex # src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml # src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # src/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_5.jar # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex # src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.jsonmaster
commit
8eb53052c3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
#Tue Aug 16 08:21:03 CST 2022
|
||||
gradle.version=7.3.3
|
||||
Binary file not shown.
Binary file not shown.
@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="deploymentTargetDropDown">
|
||||
<targetSelectedWithDropDown>
|
||||
<Target>
|
||||
<type value="QUICK_BOOT_TARGET" />
|
||||
<deviceKey>
|
||||
<Key>
|
||||
<type value="VIRTUAL_DEVICE_PATH" />
|
||||
<value value="C:\Users\38979\.android\avd\Pixel_3_API_22.avd" />
|
||||
</Key>
|
||||
</deviceKey>
|
||||
</Target>
|
||||
</targetSelectedWithDropDown>
|
||||
<timeTargetWasSelectedWithDropDown value="2022-08-16T12:15:22.776851900Z" />
|
||||
</component>
|
||||
</project>
|
||||
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding">
|
||||
<file url="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java" charset="UTF-8" />
|
||||
</component>
|
||||
</project>
|
||||
@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DesignSurface">
|
||||
<option name="filePathToZoomLevelMap">
|
||||
<map>
|
||||
<entry key="..\:/git_program/Notes-master_read/src/app/src/main/res/layout/note_list.xml" value="0.19519927536231885" />
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,2 @@
|
||||
#Tue Aug 30 08:07:35 CST 2022
|
||||
gradle.version=7.3.3
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,44 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DesignSurface">
|
||||
<option name="filePathToZoomLevelMap">
|
||||
<map>
|
||||
<entry key="..\:/Android/SDK/platforms/android-22/data/res/layout-xlarge/activity_list.xml" value="0.1" />
|
||||
<entry key="..\:/Android/SDK/platforms/android-22/data/res/layout/alert_dialog.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/layout/dialog_edit_text.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/layout/note_edit.xml" value="0.32364096080910243" />
|
||||
<entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/layout/note_edit_list_item.xml" value="0.3333333333333333" />
|
||||
<entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/layout/password.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/menu/note_edit.xml" value="0.17916666666666667" />
|
||||
<entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/menu/private_folder.xml" value="0.17916666666666667" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/account_dialog_title.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/add_account_text.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/datetime_picker.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/dialog_edit_text.xml" value="0.3333333333333333" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/folder_list_item.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/note_edit.xml" value="0.3333333333333333" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/note_edit_list_item.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/note_item.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/note_list.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/note_list_dropdown_menu.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/note_list_footer.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/password.xml" value="0.10552536231884058" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/layout/settings_header.xml" value="0.22" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/menu/call_record_folder.xml" value="0.17916666666666667" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/menu/note_edit.xml" value="0.22" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/menu/note_list.xml" value="0.17916666666666667" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/menu/note_list_dropdown.xml" value="0.17916666666666667" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/menu/note_list_options.xml" value="0.17916666666666667" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/menu/private_folder.xml" value="0.178125" />
|
||||
<entry key="..\:/Notes1/app/src/main/res/menu/sub_folder.xml" value="0.17916666666666667" />
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
<option name="id" value="Android" />
|
||||
</component>
|
||||
</project>
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@ -1,14 +1,15 @@
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 32
|
||||
//useLibrary 'org.apache.http.legacy'
|
||||
compileSdk 22
|
||||
buildToolsVersion "33.0.0"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "net.micode.notes"
|
||||
useLibrary'org.apache.http.legacy'
|
||||
|
||||
minSdkVersion 14
|
||||
targetSdkVersion 14
|
||||
targetSdkVersion 29
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
Binary file not shown.
@ -0,0 +1,20 @@
|
||||
{
|
||||
"version": 3,
|
||||
"artifactType": {
|
||||
"type": "APK",
|
||||
"kind": "Directory"
|
||||
},
|
||||
"applicationId": "net.micode.notes",
|
||||
"variantName": "debug",
|
||||
"elements": [
|
||||
{
|
||||
"type": "SINGLE",
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"versionCode": 1,
|
||||
"versionName": "0.1",
|
||||
"outputFile": "app-debug.apk"
|
||||
}
|
||||
],
|
||||
"elementType": "File"
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1 @@
|
||||
4
|
||||
@ -0,0 +1,98 @@
|
||||
#Wed Oct 19 15:23:53 CST 2022
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
|
||||
net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
|
||||
net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
|
||||
net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
|
||||
net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
|
||||
net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
|
||||
net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
|
||||
net.micode.notes.app-main-7\:/raw/introduction=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
|
||||
net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
|
||||
net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/private_folder.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_private_folder.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/password.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_password.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
|
||||
net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
|
||||
net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
|
||||
net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
|
||||
net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
|
||||
net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
|
||||
net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
|
||||
net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
|
||||
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
|
||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\assets"/><source path="D:\MiNote_maintain\new_MiCode\src\Notes1\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\debug\assets"/></dataSet></merger>
|
||||
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\debug\shaders"/></dataSet></merger>
|
||||
@ -0,0 +1,4 @@
|
||||
#Wed Oct 19 20:18:10 CST 2022
|
||||
base.0=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
renamed.0=classes.dex
|
||||
path.0=classes.dex
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue