diff options
author | Christian Schneppe <kriztan@users.noreply.github.com> | 2018-09-27 18:42:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-27 18:42:25 +0200 |
commit | 4f4a52f068f3b3956aca5934531a48d1f90d7974 (patch) | |
tree | da24e0f840730a75f2b3dab69a3b5f12025391be /src/main/AndroidManifest.xml | |
parent | 1816092e68584b5794303578b6af6d621ffc58d4 (diff) | |
parent | f4ac1f68feac3e3b19ab5932ede9d79dd14bff27 (diff) |
Merge branch 'master' into bubble-into-avatar
Diffstat (limited to 'src/main/AndroidManifest.xml')
-rw-r--r-- | src/main/AndroidManifest.xml | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 79b621878..bfdb2ec3d 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -214,18 +214,10 @@ android:launchMode="singleTop"> <intent-filter> <action android:name="android.intent.action.SEND" /> - <category android:name="android.intent.category.DEFAULT" /> - <data android:mimeType="text/plain" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.SEND" /> - <category android:name="android.intent.category.DEFAULT" /> - <data android:mimeType="*/*" /> - </intent-filter> - <intent-filter> <action android:name="android.intent.action.SEND_MULTIPLE" /> + <category android:name="android.intent.category.DEFAULT" /> - <data android:mimeType="image/*" /> + <data android:mimeType="*/*" /> </intent-filter> <meta-data @@ -283,6 +275,10 @@ android:theme="@style/Base.Theme.AppCompat" /> <activity android:name=".ui.MemorizingActivity" /> + <activity + android:name=".ui.MediaBrowserActivity" + android:label="@string/media_browser" /> + <service android:name=".services.ExportLogsService" /> <service android:name=".services.ContactChooserTargetService" |