Fix issue with Manifest merging
This commit is contained in:
Thomas
parent
d5a5fdf52e
commit
d5f394dfea
|
|
@ -150,7 +150,6 @@ android {
|
||||||
google_full {
|
google_full {
|
||||||
res.srcDirs = ['src/main/res', 'src/full/res', 'src/google_donation/res', 'src/google_cast_lib/res']
|
res.srcDirs = ['src/main/res', 'src/full/res', 'src/google_donation/res', 'src/google_cast_lib/res']
|
||||||
java.srcDirs = ['src/main/java', 'src/full/java', 'src/google_donation/java', 'src/google_cast_lib/java']
|
java.srcDirs = ['src/main/java', 'src/full/java', 'src/google_donation/java', 'src/google_cast_lib/java']
|
||||||
manifest.srcFile "src/google_cast_lib/AndroidManifest.xml"
|
|
||||||
}
|
}
|
||||||
queermotion {
|
queermotion {
|
||||||
res.srcDirs = ['src/main/res', 'src/queermotion/res', 'src/no_google_cast_lib/res']
|
res.srcDirs = ['src/main/res', 'src/queermotion/res', 'src/no_google_cast_lib/res']
|
||||||
|
|
@ -159,7 +158,6 @@ android {
|
||||||
bittube {
|
bittube {
|
||||||
res.srcDirs = ['src/main/res', 'src/bittube/res', 'src/google_cast_lib/res']
|
res.srcDirs = ['src/main/res', 'src/bittube/res', 'src/google_cast_lib/res']
|
||||||
java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java', 'src/google_cast_lib/java']
|
java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java', 'src/google_cast_lib/java']
|
||||||
manifest.srcFile "src/google_cast_lib/AndroidManifest.xml"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,46 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
package="app.fedilab.fedilabtube">
|
||||||
|
|
||||||
|
<uses-permission android:name="com.android.vending.BILLING" />
|
||||||
|
<application
|
||||||
|
android:name=".FedilabTube"
|
||||||
|
android:allowBackup="false"
|
||||||
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
|
android:supportsRtl="true"
|
||||||
|
android:theme="@style/AppTheme"
|
||||||
|
tools:replace="android:allowBackup">
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name=".PeertubeActivity"
|
||||||
|
tools:node="mergeOnlyAttributes">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.VIEW" />
|
||||||
|
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
|
<!-- The app is a good candidate for URL in https://domain.name/videos/watch/xxxxx-->
|
||||||
|
<data
|
||||||
|
android:host="*"
|
||||||
|
android:pathPrefix="/videos/watch/"
|
||||||
|
android:scheme="https" />
|
||||||
|
<meta-data
|
||||||
|
android:name="android.support.PARENT_ACTIVITY"
|
||||||
|
android:value=".PeertubeActivity" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name=".expandedcontrols.ExpandedControlsActivity"
|
||||||
|
android:theme="@style/AppThemeNoActionBar"
|
||||||
|
|
||||||
|
/>
|
||||||
|
|
||||||
|
<meta-data
|
||||||
|
android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
|
||||||
|
android:value="app.fedilab.fedilabtube.provider.CastOptionsProvider" />
|
||||||
|
</application>
|
||||||
|
</manifest>
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
package="app.fedilab.fedilabtube">
|
|
||||||
|
|
||||||
<application>
|
|
||||||
<activity
|
|
||||||
android:name=".PeertubeActivity"
|
|
||||||
tools:node="merge">
|
|
||||||
<meta-data
|
|
||||||
android:name="android.support.PARENT_ACTIVITY"
|
|
||||||
android:value=".PeertubeActivity" />
|
|
||||||
</activity>
|
|
||||||
<activity
|
|
||||||
android:name=".expandedcontrols.ExpandedControlsActivity"
|
|
||||||
android:theme="@style/AppThemeNoActionBar"
|
|
||||||
|
|
||||||
/>
|
|
||||||
|
|
||||||
<meta-data
|
|
||||||
android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
|
|
||||||
android:value="app.fedilab.fedilabtube.provider.CastOptionsProvider" />
|
|
||||||
</application>
|
|
||||||
</manifest>
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".PeertubeActivity"
|
android:name=".PeertubeActivity"
|
||||||
tools:node="mergeOnlyAttributes">
|
tools:node="merge">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.VIEW" />
|
<action android:name="android.intent.action.VIEW" />
|
||||||
|
|
||||||
|
|
@ -28,8 +28,21 @@
|
||||||
android:pathPrefix="/videos/watch/"
|
android:pathPrefix="/videos/watch/"
|
||||||
android:scheme="https" />
|
android:scheme="https" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
<meta-data
|
||||||
|
android:name="android.support.PARENT_ACTIVITY"
|
||||||
|
android:value=".PeertubeActivity" />
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name=".expandedcontrols.ExpandedControlsActivity"
|
||||||
|
android:theme="@style/AppThemeNoActionBar"
|
||||||
|
|
||||||
|
/>
|
||||||
|
|
||||||
|
<meta-data
|
||||||
|
android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
|
||||||
|
android:value="app.fedilab.fedilabtube.provider.CastOptionsProvider" />
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".DonationActivity"
|
android:name=".DonationActivity"
|
||||||
android:configChanges="orientation|screenSize"
|
android:configChanges="orientation|screenSize"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue