Images added, Final-release
This commit is contained in:
@@ -40,7 +40,7 @@ MERGED from com.android.support:support-v4:21.0.3:16:5
|
||||
ADDED from AndroidManifest.xml:15:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:11:13
|
||||
activity#com.raataar.sapientia_full.MainActivity
|
||||
activity#com.raataar.zitate_allinone.MainActivity
|
||||
ADDED from AndroidManifest.xml:16:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:18:17
|
||||
@@ -56,7 +56,7 @@ category#android.intent.category.LAUNCHER
|
||||
ADDED from AndroidManifest.xml:22:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:22:27
|
||||
activity#com.raataar.sapientia_full.KategorieActivity
|
||||
activity#com.raataar.zitate_allinone.KategorieActivity
|
||||
ADDED from AndroidManifest.xml:25:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:27:17
|
||||
@@ -70,7 +70,7 @@ ADDED from AndroidManifest.xml:30:13
|
||||
ADDED from AndroidManifest.xml:32:21
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:31:21
|
||||
activity#com.raataar.sapientia_full.KategorieByIDActivity
|
||||
activity#com.raataar.zitate_allinone.KategorieByIDActivity
|
||||
ADDED from AndroidManifest.xml:34:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:36:17
|
||||
@@ -78,13 +78,13 @@ ADDED from AndroidManifest.xml:34:9
|
||||
ADDED from AndroidManifest.xml:37:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:35:17
|
||||
activity#com.raataar.sapientia_full.ZitatActivity
|
||||
activity#com.raataar.zitate_allinone.ZitatActivity
|
||||
ADDED from AndroidManifest.xml:43:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:45:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:44:17
|
||||
activity#com.raataar.sapientia_full.ZufallZitatActivity
|
||||
activity#com.raataar.zitate_allinone.ZufallZitatActivity
|
||||
ADDED from AndroidManifest.xml:47:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:49:17
|
||||
@@ -92,7 +92,7 @@ ADDED from AndroidManifest.xml:47:9
|
||||
ADDED from AndroidManifest.xml:50:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:48:17
|
||||
activity#com.raataar.sapientia_full.NewsActivity
|
||||
activity#com.raataar.zitate_allinone.NewsActivity
|
||||
ADDED from AndroidManifest.xml:56:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:58:13
|
||||
@@ -100,7 +100,7 @@ ADDED from AndroidManifest.xml:56:9
|
||||
ADDED from AndroidManifest.xml:59:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:57:13
|
||||
activity#com.raataar.sapientia_full.AutorenActivity
|
||||
activity#com.raataar.zitate_allinone.AutorenActivity
|
||||
ADDED from AndroidManifest.xml:65:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:67:17
|
||||
@@ -108,7 +108,7 @@ ADDED from AndroidManifest.xml:65:9
|
||||
ADDED from AndroidManifest.xml:68:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:66:17
|
||||
activity#com.raataar.sapientia_full.AutorenByIDActivity
|
||||
activity#com.raataar.zitate_allinone.AutorenByIDActivity
|
||||
ADDED from AndroidManifest.xml:74:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:76:17
|
||||
@@ -116,7 +116,7 @@ ADDED from AndroidManifest.xml:74:9
|
||||
ADDED from AndroidManifest.xml:77:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:75:17
|
||||
activity#com.raataar.sapientia_full.SuchenActivity
|
||||
activity#com.raataar.zitate_allinone.SuchenActivity
|
||||
ADDED from AndroidManifest.xml:83:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:85:17
|
||||
@@ -124,7 +124,7 @@ ADDED from AndroidManifest.xml:83:9
|
||||
ADDED from AndroidManifest.xml:86:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:84:17
|
||||
activity#com.raataar.sapientia_full.SuchenByIDActivity
|
||||
activity#com.raataar.zitate_allinone.SuchenByIDActivity
|
||||
ADDED from AndroidManifest.xml:92:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:94:17
|
||||
|
||||
134
app/build/outputs/logs/manifest-merger-release-report.txt
Normal file
134
app/build/outputs/logs/manifest-merger-release-report.txt
Normal file
@@ -0,0 +1,134 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from AndroidManifest.xml:2:1
|
||||
package
|
||||
ADDED from AndroidManifest.xml:3:11
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
android:versionName
|
||||
ADDED from AndroidManifest.xml:5:11
|
||||
android:versionCode
|
||||
ADDED from AndroidManifest.xml:4:11
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
xmlns:android
|
||||
ADDED from AndroidManifest.xml:2:11
|
||||
uses-sdk
|
||||
ADDED from AndroidManifest.xml:6:5
|
||||
MERGED from com.android.support:support-v4:21.0.3:15:5
|
||||
android:targetSdkVersion
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
android:minSdkVersion
|
||||
ADDED from AndroidManifest.xml:6:15
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
uses-permission#android.permission.INTERNET
|
||||
ADDED from AndroidManifest.xml:8:5
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:8:22
|
||||
application
|
||||
ADDED from AndroidManifest.xml:10:5
|
||||
MERGED from com.android.support:support-v4:21.0.3:16:5
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:14:13
|
||||
android:allowBackup
|
||||
ADDED from AndroidManifest.xml:12:13
|
||||
android:icon
|
||||
ADDED from AndroidManifest.xml:13:13
|
||||
android:theme
|
||||
ADDED from AndroidManifest.xml:15:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:11:13
|
||||
activity#com.raataar.zitate_allinone.MainActivity
|
||||
ADDED from AndroidManifest.xml:16:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:18:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:17:17
|
||||
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
|
||||
ADDED from AndroidManifest.xml:19:13
|
||||
action#android.intent.action.MAIN
|
||||
ADDED from AndroidManifest.xml:20:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:20:25
|
||||
category#android.intent.category.LAUNCHER
|
||||
ADDED from AndroidManifest.xml:22:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:22:27
|
||||
activity#com.raataar.zitate_allinone.KategorieActivity
|
||||
ADDED from AndroidManifest.xml:25:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:27:17
|
||||
android:parentActivityName
|
||||
ADDED from AndroidManifest.xml:28:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:26:17
|
||||
meta-data#android.support.PARENT_ACTIVITY
|
||||
ADDED from AndroidManifest.xml:30:13
|
||||
android:value
|
||||
ADDED from AndroidManifest.xml:32:21
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:31:21
|
||||
activity#com.raataar.zitate_allinone.KategorieByIDActivity
|
||||
ADDED from AndroidManifest.xml:34:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:36:17
|
||||
android:parentActivityName
|
||||
ADDED from AndroidManifest.xml:37:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:35:17
|
||||
activity#com.raataar.zitate_allinone.ZitatActivity
|
||||
ADDED from AndroidManifest.xml:43:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:45:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:44:17
|
||||
activity#com.raataar.zitate_allinone.ZufallZitatActivity
|
||||
ADDED from AndroidManifest.xml:47:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:49:17
|
||||
android:parentActivityName
|
||||
ADDED from AndroidManifest.xml:50:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:48:17
|
||||
activity#com.raataar.zitate_allinone.NewsActivity
|
||||
ADDED from AndroidManifest.xml:56:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:58:13
|
||||
android:parentActivityName
|
||||
ADDED from AndroidManifest.xml:59:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:57:13
|
||||
activity#com.raataar.zitate_allinone.AutorenActivity
|
||||
ADDED from AndroidManifest.xml:65:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:67:17
|
||||
android:parentActivityName
|
||||
ADDED from AndroidManifest.xml:68:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:66:17
|
||||
activity#com.raataar.zitate_allinone.AutorenByIDActivity
|
||||
ADDED from AndroidManifest.xml:74:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:76:17
|
||||
android:parentActivityName
|
||||
ADDED from AndroidManifest.xml:77:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:75:17
|
||||
activity#com.raataar.zitate_allinone.SuchenActivity
|
||||
ADDED from AndroidManifest.xml:83:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:85:17
|
||||
android:parentActivityName
|
||||
ADDED from AndroidManifest.xml:86:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:84:17
|
||||
activity#com.raataar.zitate_allinone.SuchenByIDActivity
|
||||
ADDED from AndroidManifest.xml:92:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:94:17
|
||||
android:parentActivityName
|
||||
ADDED from AndroidManifest.xml:95:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:93:17
|
||||
Reference in New Issue
Block a user