summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-12-02 08:53:59 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-12-02 08:53:59 -0800
commit9897fb2d0072f942520b312514c85de7d43d8dd2 (patch)
treebd2e8a396b2fced6a0fdf1862cfe45a5b874a4dd
parentfbf5bb1f0f5a2966541f7733542c23eb0f91fe71 (diff)
parenta28677726eaaaf1c90a2e04cf66e27bd76c91d06 (diff)
downloadandroid_packages_apps_Gallery2-9897fb2d0072f942520b312514c85de7d43d8dd2.tar.gz
android_packages_apps_Gallery2-9897fb2d0072f942520b312514c85de7d43d8dd2.tar.bz2
android_packages_apps_Gallery2-9897fb2d0072f942520b312514c85de7d43d8dd2.zip
Merge "Gallery2: add extra mimetypes to gallery manifest"
-rw-r--r--AndroidManifest.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 84b3eb700..b7960a26d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -92,6 +92,14 @@
<data android:mimeType="video/webm" />
<data android:mimeType="video/avi" />
<data android:mimeType="application/sdp" />
+ <data android:mimeType="video/mp2ts" />
+ <data android:mimeType="video/x-ms-asf" />
+ <data android:mimeType="video/x-ms-wmv" />
+ <data android:mimeType="video/x-matroska" />
+ <data android:mimeType="video/x-msvideo"/>
+ <data android:mimeType="video/divx" />
+ <data android:mimeType="video/mkv" />
+ <data android:mimeType="video/mpeg" />
</intent-filter>
<intent-filter>
<!-- HTTP live support -->