pk4ygijfv
/
MiNote
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tzm-firstcommit2

Browse Source
tzm_branch
cloud-lost-night 2 years ago
parent fb8ed17dfc 2751d654ea
commit 8fc7f6b9fe
14 changed files with 635 additions and 0 deletions
Show Stats Download Patch File Download Diff File

3
src/app/build.gradle
Unescape View File

@ -23,10 +23,13 @@ android {
} }
dependencies { dependencies {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
implementation fileTree(dir: 'E:\\code\\Android\\mi-note\\src\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'], implementation fileTree(dir: 'E:\\code\\Android\\mi-note\\src\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'],
exclude: ['commons-codec-1.11.jar','httpclient-4.5.14.jar','httpclient-cache-4.5.14.jar','httpmime-4.5.14.jar','fluent-hc-4.5.14.jar']) exclude: ['commons-codec-1.11.jar','httpclient-4.5.14.jar','httpclient-cache-4.5.14.jar','httpmime-4.5.14.jar','fluent-hc-4.5.14.jar'])
======= =======
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
implementation fileTree(dir: 'D:\\Code\\Repository\\Android\\Notes2\\src\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'], exclude: [], implementation fileTree(dir: 'D:\\Code\\Repository\\Android\\Notes2\\src\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'], exclude: [],
excludes: ['commons-codec-1.11.jar','httpclient-4.5.14.jar','httpclient-cache-4.5.14.jar','httpmime-4.5.14.jar','fluent-hc-4.5.14.jar']) excludes: ['commons-codec-1.11.jar','httpclient-4.5.14.jar','httpclient-cache-4.5.14.jar','httpmime-4.5.14.jar','fluent-hc-4.5.14.jar'])
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5

6
src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
Unescape View File

@ -1,4 +1,5 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
#Thu Sep 14 17:58:45 CST 2023 #Thu Sep 14 17:58:45 CST 2023
net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
@ -96,6 +97,8 @@ net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=E\:\\code\\Androi
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
======= =======
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
#Fri Sep 15 09:58:37 CST 2023 #Fri Sep 15 09:58:37 CST 2023
net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
@ -192,4 +195,7 @@ net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\Code\\Reposit
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
<<<<<<< HEAD
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5

26
src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

4
src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
Unescape View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\app\src\main\assets"/><source path="E:\code\Android\mi-note\src\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:\code\Android\mi-note\src\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:\code\Android\mi-note\src\app\src\main\assets"/><source path="E:\code\Android\mi-note\src\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:\code\Android\mi-note\src\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="D:\Code\Repository\Android\Notes2\src\app\src\main\assets"/><source path="D:\Code\Repository\Android\Notes2\src\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:\Code\Repository\Android\Notes2\src\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="D:\Code\Repository\Android\Notes2\src\app\src\main\assets"/><source path="D:\Code\Repository\Android\Notes2\src\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:\Code\Repository\Android\Notes2\src\app\src\debug\assets"/></dataSet></merger>
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\assets"/><source path="D:\Code\Repository\Android\Notes2\src\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:\Code\Repository\Android\Notes2\src\app\src\debug\assets"/></dataSet></merger>
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5

4
src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
Unescape View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\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:\code\Android\mi-note\src\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:\code\Android\mi-note\src\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:\code\Android\mi-note\src\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="D:\Code\Repository\Android\Notes2\src\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:\Code\Repository\Android\Notes2\src\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="D:\Code\Repository\Android\Notes2\src\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:\Code\Repository\Android\Notes2\src\app\src\debug\jniLibs"/></dataSet></merger>
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\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:\Code\Repository\Android\Notes2\src\app\src\debug\jniLibs"/></dataSet></merger>
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5

4
src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
Unescape View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\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:\code\Android\mi-note\src\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:\code\Android\mi-note\src\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:\code\Android\mi-note\src\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="D:\Code\Repository\Android\Notes2\src\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:\Code\Repository\Android\Notes2\src\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="D:\Code\Repository\Android\Notes2\src\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:\Code\Repository\Android\Notes2\src\app\src\debug\shaders"/></dataSet></merger>
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\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:\Code\Repository\Android\Notes2\src\app\src\debug\shaders"/></dataSet></merger>
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5

5
src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
Unescape View File

@ -1,9 +1,14 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
#Thu Sep 14 18:02:40 CST 2023 #Thu Sep 14 18:02:40 CST 2023
base.0=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex base.0=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
======= =======
#Sun Sep 17 16:46:56 CST 2023 #Sun Sep 17 16:46:56 CST 2023
base.0=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex base.0=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
#Sun Sep 17 16:46:56 CST 2023
base.0=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
renamed.0=classes.dex renamed.0=classes.dex
path.0=classes.dex path.0=classes.dex

271
src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
Unescape View File

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

23
src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
Unescape View File

@ -4,9 +4,12 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [ "map": [
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
======= =======
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": { "from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
@ -27,6 +30,9 @@
}, },
{ {
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
<<<<<<< HEAD
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
"from": { "from": {
"startLines": "18", "startLines": "18",
@ -70,6 +76,7 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
"map": [ "map": [
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\dimens.xml", "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\dimens.xml",
"from": { "from": {
@ -106,6 +113,9 @@
}, },
{ {
"source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\arrays.xml", "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\arrays.xml",
=======
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml",
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
======= =======
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml", "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml",
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
@ -127,9 +137,12 @@
} }
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\styles.xml", "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\styles.xml",
======= =======
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\strings.xml", "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\strings.xml",
"from": { "from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
@ -184,6 +197,9 @@
}, },
{ {
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\styles.xml", "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\styles.xml",
<<<<<<< HEAD
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
"from": { "from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45", "startLines": "50,55,64,60,22,26,30,35,40,18,45",
@ -201,6 +217,7 @@
"endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
}, },
{ {
@ -222,6 +239,8 @@
"endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
} }
======= =======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
} }
] ]
@ -230,6 +249,7 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [ "map": [
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": { "from": {
@ -251,6 +271,9 @@
}, },
{ {
"source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
=======
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
======= =======
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5

6
src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
Unescape View File

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

4
src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
Unescape View File

@ -4,6 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
"map": [ "map": [
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": { "from": {
@ -25,6 +26,9 @@
}, },
{ {
"source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
=======
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
======= =======
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5

13
src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
Unescape View File

@ -4,6 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
"map": [ "map": [
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\dimens.xml", "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\dimens.xml",
"from": { "from": {
@ -40,6 +41,9 @@
}, },
{ {
"source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\arrays.xml", "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\arrays.xml",
=======
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml",
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
======= =======
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml", "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml",
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
@ -61,9 +65,12 @@
} }
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\styles.xml", "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\styles.xml",
======= =======
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\strings.xml", "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\strings.xml",
"from": { "from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
@ -118,6 +125,9 @@
}, },
{ {
"source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\styles.xml", "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\styles.xml",
<<<<<<< HEAD
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
"from": { "from": {
"startLines": "50,55,64,60,22,26,30,35,40,18,45", "startLines": "50,55,64,60,22,26,30,35,40,18,45",
@ -135,6 +145,7 @@
"endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
}, },
{ {
@ -156,6 +167,8 @@
"endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
} }
======= =======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
} }
] ]

6
src/app/build/intermediates/source_set_path_map/debug/file-map.txt
Unescape View File

@ -1,4 +1,5 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
net.micode.notes.app-pngs-0 E:\code\Android\mi-note\src\app\build\generated\res\pngs\debug net.micode.notes.app-pngs-0 E:\code\Android\mi-note\src\app\build\generated\res\pngs\debug
net.micode.notes.app-resValues-1 E:\code\Android\mi-note\src\app\build\generated\res\resValues\debug net.micode.notes.app-resValues-1 E:\code\Android\mi-note\src\app\build\generated\res\resValues\debug
net.micode.notes.app-rs-2 E:\code\Android\mi-note\src\app\build\generated\res\rs\debug net.micode.notes.app-rs-2 E:\code\Android\mi-note\src\app\build\generated\res\rs\debug
@ -8,6 +9,8 @@ net.micode.notes.app-merged_res-5 E:\code\Android\mi-note\src\app\build\intermed
net.micode.notes.app-debug-6 E:\code\Android\mi-note\src\app\src\debug\res net.micode.notes.app-debug-6 E:\code\Android\mi-note\src\app\src\debug\res
net.micode.notes.app-main-7 E:\code\Android\mi-note\src\app\src\main\res net.micode.notes.app-main-7 E:\code\Android\mi-note\src\app\src\main\res
======= =======
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
net.micode.notes.app-pngs-0 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\pngs\debug net.micode.notes.app-pngs-0 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\pngs\debug
net.micode.notes.app-resValues-1 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\debug net.micode.notes.app-resValues-1 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\debug
net.micode.notes.app-rs-2 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\debug net.micode.notes.app-rs-2 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\debug
@ -16,4 +19,7 @@ net.micode.notes.app-mergeDebugResources-4 D:\Code\Repository\Android\Notes2\src
net.micode.notes.app-merged_res-5 D:\Code\Repository\Android\Notes2\src\app\build\intermediates\merged_res\debug net.micode.notes.app-merged_res-5 D:\Code\Repository\Android\Notes2\src\app\build\intermediates\merged_res\debug
net.micode.notes.app-debug-6 D:\Code\Repository\Android\Notes2\src\app\src\debug\res net.micode.notes.app-debug-6 D:\Code\Repository\Android\Notes2\src\app\src\debug\res
net.micode.notes.app-main-7 D:\Code\Repository\Android\Notes2\src\app\src\main\res net.micode.notes.app-main-7 D:\Code\Repository\Android\Notes2\src\app\src\main\res
<<<<<<< HEAD
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5

260
src/app/build/outputs/logs/manifest-merger-debug-report.txt
Unescape View File

@ -1,6 +1,7 @@
-- Merging decision tree log --- -- Merging decision tree log ---
manifest manifest
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12
INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12
INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12
@ -517,3 +518,262 @@ ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xm
android:name android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:157:13-58 ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:157:13-58
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 >>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
=======
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
package
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:20:5-31
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
android:versionName
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:22:5-30
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
xmlns:tools
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:19:5-51
xmlns:android
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:11-69
android:versionCode
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:21:5-28
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
uses-sdk
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
android:targetSdkVersion
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
android:minSdkVersion
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:15-41
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:26:5-81
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:26:22-78
uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:27:5-88
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:27:22-85
uses-permission#android.permission.INTERNET
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:28:5-67
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:28:22-64
uses-permission#android.permission.READ_CONTACTS
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:29:5-72
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:29:22-69
uses-permission#android.permission.MANAGE_ACCOUNTS
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:30:5-74
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:30:22-71
uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:31:5-80
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:31:22-77
uses-permission#android.permission.GET_ACCOUNTS
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:32:5-71
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:32:22-68
uses-permission#android.permission.USE_CREDENTIALS
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:33:5-74
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:33:22-71
uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:34:5-81
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:34:22-78
application
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:36:5-159:19
android:label
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:38:9-41
android:icon
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:37:9-42
activity#net.micode.notes.ui.NotesListActivity
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:39:9-53:20
android:label
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:43:13-45
android:launchMode
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:44:13-43
android:windowSoftInputMode
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:47:13-52
android:exported
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:40:13-36
android:uiOptions
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:46:13-57
android:configChanges
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:42:13-74
android:theme
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:45:13-45
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:41:13-49
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:49:13-52:29
action#android.intent.action.MAIN
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:17-69
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:25-66
category#android.intent.category.LAUNCHER
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:17-77
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:27-74
activity#net.micode.notes.ui.NoteEditActivity
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:55:9-85:20
android:launchMode
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:59:13-43
android:exported
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:56:13-36
android:configChanges
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:58:13-74
android:theme
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:60:13-45
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:57:13-48
intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:13-68:29
android:scheme
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:28-49
tools:ignore
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:63:17-47
action#android.intent.action.VIEW
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:17-69
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:25-66
category#android.intent.category.DEFAULT
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73
data
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
android:mimeType
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:70:13-75:29
action#android.intent.action.INSERT_OR_EDIT
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:17-79
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:25-76
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:77:13-80:29
action#android.intent.action.SEARCH
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:17-71
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:25-68
meta-data#android.app.searchable
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:82:13-84:54
android:resource
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:84:17-51
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:83:17-54
provider#net.micode.notes.data.NotesProvider
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:87:9-91:43
android:authorities
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:90:13-47
android:multiprocess
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:91:13-40
android:exported
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:88:13-37
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:89:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:93:9-106:20
android:label
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:96:13-50
android:exported
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:94:13-37
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:95:13-57
intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29
action#android.appwidget.action.APPWIDGET_UPDATE
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81
action#android.appwidget.action.APPWIDGET_DELETED
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82
action#android.intent.action.PRIVACY_MODE_CHANGED
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82
meta-data#android.appwidget.provider
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58
android:resource
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:107:9-121:20
android:label
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:110:13-50
android:exported
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:108:13-36
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:109:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:9-127:20
android:exported
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:56-80
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:124:13-126:29
action#android.intent.action.BOOT_COMPLETED
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:17-79
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:25-76
receiver#net.micode.notes.ui.AlarmReceiver
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:129:9-133:20
android:process
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:132:13-38
android:exported
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:130:13-37
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:131:13-61
activity#net.micode.notes.ui.AlarmAlertActivity
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:135:9-141:20
android:label
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:138:13-45
android:launchMode
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:139:13-48
android:exported
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:136:13-37
android:theme
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:140:13-75
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:137:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:143:9-149:20
android:label
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:146:13-54
android:launchMode
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:147:13-43
android:exported
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:144:13-37
android:theme
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:148:13-60
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:145:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:151:9-154:19
android:exported
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:153:13-37
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:152:13-74
meta-data#android.app.default_searchable
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:156:9-158:52
android:value
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:158:13-49
android:name
ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:157:13-58
>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5

Write Preview
Loading…
Cancel
Save