summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorEric (Quic <yinlokh@codeaurora.org>2013-01-08 10:51:27 -0800
committerSteve Kondik <shade@chemlab.org>2013-12-20 14:36:35 -0800
commitb313d03e1b572e4ffb0a5a4d51e4027e983ff9ae (patch)
tree301b6e45156e1ae01f783334c91a7d9653e4b4eb /AndroidManifest.xml
parentafec6fe647ec295b71976bc030d12411fb64a0bb (diff)
downloadandroid_packages_apps_Gallery2-b313d03e1b572e4ffb0a5a4d51e4027e983ff9ae.tar.gz
android_packages_apps_Gallery2-b313d03e1b572e4ffb0a5a4d51e4027e983ff9ae.tar.bz2
android_packages_apps_Gallery2-b313d03e1b572e4ffb0a5a4d51e4027e983ff9ae.zip
Gallery2 - add wmv, mpgts, mkv, asf mimetypes
- adds extra mimetypes so they can be used for playback from Music app Change-Id: I19a986e4c4e36b668f2436ced3441696fa6052e5 CRs-Fixed: 438167 (cherry picked from commit 2bbc6f5274fca08e769db5fecaccc51c61cac43f) (cherry picked from commit b9c182d90b364576b7ce221644c3af05ab731ce1) (cherry picked from commit 80453df71503f345309fe71ad4dfd90a444bfb0c) (cherry picked from commit 63e936188eef3528b0538fd0efb702084d6d91a5)
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 59da7eae7..5fccbe1c8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -69,6 +69,10 @@
<data android:mimeType="video/3gpp2" />
<data android:mimeType="video/webm" />
<data android:mimeType="video/avi" />
+ <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="application/sdp" />
</intent-filter>
<intent-filter>