池钰恒 去除冗余代码

pull/11/head
gexinghai 2 years ago
parent da326302eb
commit 7bfa815397

@ -1,4 +1,4 @@
#Wed Jun 07 21:16:17 CST 2023
#Wed Jun 07 21:35:53 CST 2023
base.0=C\:\\Users\\Admin\\Desktop\\gitProject1\\gitProject1\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
path.0=classes.dex
renamed.0=classes.dex

@ -40,7 +40,7 @@
19-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:19:22-78
20
21 <application
21-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:21:5-160:19
21-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:21:5-156:19
22 android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
22-->[com.android.support:support-compat:28.0.0] C:\Users\Admin\.gradle\caches\transforms-3\0b2e52951c499520cc704bc6e41bcdd6\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91
23 android:debuggable="true"
@ -291,19 +291,12 @@
150 android:theme="@android:style/Theme.Holo.Light" />
150-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:151:13-60
151
152 <service
152-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:153:9-155:40
153 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
152 <meta-data
152-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:153:9-155:52
153 android:name="android.app.default_searchable"
153-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:154:13-58
154 android:exported="false" />
154-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:155:13-37
155
156 <meta-data
156-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:157:9-159:52
157 android:name="android.app.default_searchable"
157-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:158:13-58
158 android:value=".ui.NoteEditActivity" />
158-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:159:13-49
159 </application>
160
161</manifest>
154 android:value=".ui.NoteEditActivity" />
154-->C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:155:13-49
155 </application>
156
157</manifest>

@ -149,10 +149,6 @@
android:launchMode="singleTop"
android:theme="@android:style/Theme.Holo.Light" />
<service
android:name="net.micode.notes.gtask.remote.GTaskSyncService"
android:exported="false" />
<meta-data
android:name="android.app.default_searchable"
android:value=".ui.NoteEditActivity" />

@ -149,10 +149,6 @@
android:launchMode="singleTop"
android:theme="@android:style/Theme.Holo.Light" />
<service
android:name="net.micode.notes.gtask.remote.GTaskSyncService"
android:exported="false" />
<meta-data
android:name="android.app.default_searchable"
android:value=".ui.NoteEditActivity" />

@ -149,10 +149,6 @@
android:launchMode="singleTop"
android:theme="@android:style/Theme.Holo.Light" />
<service
android:name="net.micode.notes.gtask.remote.GTaskSyncService"
android:exported="false" />
<meta-data
android:name="android.app.default_searchable"
android:value=".ui.NoteEditActivity" />

@ -1,9 +1,9 @@
-- Merging decision tree log ---
manifest
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-162:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-162:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-162:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-162:12
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-158:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-158:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-158:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-158:12
MERGED from [com.android.databinding:viewbinding:8.0.0] C:\Users\Admin\.gradle\caches\transforms-3\bb5442f90e27850ba0b1f8cca721e007\transformed\viewbinding-8.0.0\AndroidManifest.xml:2:1-7:12
MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\Admin\.gradle\caches\transforms-3\fec987269e863d3838b3f502bfb71bc0\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\Admin\.gradle\caches\transforms-3\286f665014af5aed11ebfe38cea41635\transformed\support-fragment-28.0.0\AndroidManifest.xml:17:1-22:12
@ -31,12 +31,12 @@ MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\Admin\.gradle\cache
MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\Admin\.gradle\caches\transforms-3\f49fe7bd586a42c57f5e74f858b90dd3\transformed\livedata-core-1.1.1\AndroidManifest.xml:17:1-22:12
MERGED from [android.arch.core:runtime:1.1.1] C:\Users\Admin\.gradle\caches\transforms-3\b4029a7ffb7fa944593ee2cbca83693e\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12
MERGED from [com.android.support:interpolator:28.0.0] C:\Users\Admin\.gradle\caches\transforms-3\11d9a409210d081b3cca23b4a598deca\transformed\interpolator-28.0.0\AndroidManifest.xml:17:1-22:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-162:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-162:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-162:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-158:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-158:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-158:12
package
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-162:12
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:2:1-158:12
INJECTED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml
android:versionName
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:5:5-30
@ -157,7 +157,7 @@ ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main
android:name
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:19:22-78
application
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:21:5-160:19
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:21:5-156:19
MERGED from [com.android.support:support-compat:28.0.0] C:\Users\Admin\.gradle\caches\transforms-3\0b2e52951c499520cc704bc6e41bcdd6\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94
MERGED from [com.android.support:support-compat:28.0.0] C:\Users\Admin\.gradle\caches\transforms-3\0b2e52951c499520cc704bc6e41bcdd6\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94
MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\Admin\.gradle\caches\transforms-3\cc39f0db9db0878af0f37c619b6f225d\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19
@ -344,15 +344,9 @@ ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:151:13-60
android:name
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:148:13-55
service#net.micode.notes.gtask.remote.GTaskSyncService
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:153:9-155:40
android:exported
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:155:13-37
android:name
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:154:13-58
meta-data#android.app.default_searchable
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:157:9-159:52
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:153:9-155:52
android:value
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:159:13-49
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:155:13-49
android:name
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:158:13-58
ADDED from C:\Users\Admin\Desktop\gitProject1\gitProject1\src\Notes\app\src\main\AndroidManifest.xml:154:13-58

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

Loading…
Cancel
Save