aboutsummaryrefslogtreecommitdiffstats
path: root/res/raw
diff options
context:
space:
mode:
authorMatt Garnes <matt@cyngn.com>2015-03-23 17:52:59 -0700
committerMatt Garnes <matt@cyngn.com>2015-03-26 17:26:33 +0000
commit6e039982eb0d6f8bc39d8690f67b2622ec1efcb0 (patch)
tree38ffa8a94ca22bdc860fe7ed8f904f675d7ddd23 /res/raw
parent1288edb9bc0b752d157af7f17d00de52bcf61652 (diff)
downloadandroid_packages_apps_CMFileManager-6e039982eb0d6f8bc39d8690f67b2622ec1efcb0.tar.gz
android_packages_apps_CMFileManager-6e039982eb0d6f8bc39d8690f67b2622ec1efcb0.tar.bz2
android_packages_apps_CMFileManager-6e039982eb0d6f8bc39d8690f67b2622ec1efcb0.zip
Support ambigous file extension mimetypes.
Previously, CMFileManager operated under the assumption that file extensions map to exactly one mimetype. This is not true in some cases, such as .3gp files, which can have an audio or video mimetype. Add support so that in mime_types.properties we can specify a comma separated list of mimetype info that are matched with a given extension. If an AmbiguousExtensionHelper subclass implementation is provided for one of these extensions, this is used to determine the correct mimetype for the file. Change-Id: Ie73d6ad646692dfeac112ac50c1c6436e6b5559b
Diffstat (limited to 'res/raw')
-rw-r--r--res/raw/mime_types.properties14
1 files changed, 10 insertions, 4 deletions
diff --git a/res/raw/mime_types.properties b/res/raw/mime_types.properties
index 98e4924e..446918a7 100644
--- a/res/raw/mime_types.properties
+++ b/res/raw/mime_types.properties
@@ -274,10 +274,6 @@ qcp = AUDIO | audio/qcelp | fso_type_audio_drawable
xmf = AUDIO | audio/xmf | fso_type_audio_drawable
# Video
-3gp = VIDEO | video/3gpp | fso_type_video_drawable
-3gpp = VIDEO | video/3gpp | fso_type_video_drawable
-3g2 = VIDEO | video/3gpp2 | fso_type_video_drawable
-3gpp2 = VIDEO | video/3gpp2 | fso_type_video_drawable
h261 = VIDEO | video/h261 | fso_type_video_drawable
h263 = VIDEO | video/h263 | fso_type_video_drawable
h264 = VIDEO | video/h264 | fso_type_video_drawable
@@ -322,6 +318,16 @@ m4v = VIDEO | video/x-m4v | fso_type_video_drawable
divx = VIDEO | video/divx | fso_type_video_drawable
ts = VIDEO | video/MP2T | fso_type_video_drawable
+# Audio and Video
+3gp = VIDEO | video/3gpp | fso_type_video_drawable,\
+ AUDIO | audio/3gpp | fso_type_audio_drawable
+3gpp = VIDEO | video/3gpp | fso_type_video_drawable,\
+ AUDIO | audio/3gpp | fso_type_audio_drawable
+3g2 = VIDEO | video/3gpp2 | fso_type_video_drawable,\
+ AUDIO | audio/3gpp2 | fso_type_audio_drawable
+3gpp2 = VIDEO | video/3gpp2 | fso_type_video_drawable,\
+ AUDIO | audio/3gpp2 | fso_type_audio_drawable
+
# Security
asc = SECURITY | application/pgp-signature | fso_type_security_drawable
cer = SECURITY | application/pkix-cert | fso_type_security_drawable