From: Andy Scherzinger Date: Tue, 15 Sep 2015 16:44:49 +0000 (+0200) Subject: Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into materia... X-Git-Tag: beta-20151128~7^2~28 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9e15d2459d4280666e2fbc99d67326f680bf392b?hp=6f5cb9aacabe0ecf078717b876ef743f1e8f5f74 Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons --- diff --git a/res/drawable-hdpi/file_text.png b/res/drawable-hdpi/file_text.png new file mode 100644 index 00000000..ec6b005f Binary files /dev/null and b/res/drawable-hdpi/file_text.png differ diff --git a/res/drawable-ldpi-v9/ic_action_download.png b/res/drawable-ldpi-v9/ic_action_download.png deleted file mode 100644 index 41fe95a4..00000000 Binary files a/res/drawable-ldpi-v9/ic_action_download.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_action_refresh.png b/res/drawable-ldpi-v9/ic_action_refresh.png deleted file mode 100644 index bd611e8e..00000000 Binary files a/res/drawable-ldpi-v9/ic_action_refresh.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_action_settings.png b/res/drawable-ldpi-v9/ic_action_settings.png deleted file mode 100644 index e2c2d517..00000000 Binary files a/res/drawable-ldpi-v9/ic_action_settings.png and /dev/null differ diff --git a/res/drawable-ldpi/common_error.png b/res/drawable-ldpi/common_error.png deleted file mode 100644 index f1a804a6..00000000 Binary files a/res/drawable-ldpi/common_error.png and /dev/null differ diff --git a/res/drawable-ldpi/copy_link.png b/res/drawable-ldpi/copy_link.png deleted file mode 100644 index 7384309d..00000000 Binary files a/res/drawable-ldpi/copy_link.png and /dev/null differ diff --git a/res/drawable-ldpi/file.png b/res/drawable-ldpi/file.png deleted file mode 100644 index 74add13f..00000000 Binary files a/res/drawable-ldpi/file.png and /dev/null differ diff --git a/res/drawable-ldpi/file_doc.png b/res/drawable-ldpi/file_doc.png deleted file mode 100644 index 3bc2f08d..00000000 Binary files a/res/drawable-ldpi/file_doc.png and /dev/null differ diff --git a/res/drawable-ldpi/file_image.png b/res/drawable-ldpi/file_image.png deleted file mode 100644 index 8ff5e6c1..00000000 Binary files a/res/drawable-ldpi/file_image.png and /dev/null differ diff --git a/res/drawable-ldpi/file_movie.png b/res/drawable-ldpi/file_movie.png deleted file mode 100644 index 7cc1ecdc..00000000 Binary files a/res/drawable-ldpi/file_movie.png and /dev/null differ diff --git a/res/drawable-ldpi/file_pdf.png b/res/drawable-ldpi/file_pdf.png deleted file mode 100644 index 55be82f0..00000000 Binary files a/res/drawable-ldpi/file_pdf.png and /dev/null differ diff --git a/res/drawable-ldpi/file_ppt.png b/res/drawable-ldpi/file_ppt.png deleted file mode 100644 index 644fb852..00000000 Binary files a/res/drawable-ldpi/file_ppt.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_action_create_dir.png b/res/drawable-ldpi/ic_action_create_dir.png deleted file mode 100644 index 8ed2dae9..00000000 Binary files a/res/drawable-ldpi/ic_action_create_dir.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_action_download.png b/res/drawable-ldpi/ic_action_download.png deleted file mode 100644 index 7293d6da..00000000 Binary files a/res/drawable-ldpi/ic_action_download.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_action_refresh.png b/res/drawable-ldpi/ic_action_refresh.png deleted file mode 100644 index 63e70e17..00000000 Binary files a/res/drawable-ldpi/ic_action_refresh.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_action_refresh_black.png b/res/drawable-ldpi/ic_action_refresh_black.png deleted file mode 100644 index 63e70e17..00000000 Binary files a/res/drawable-ldpi/ic_action_refresh_black.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_action_settings.png b/res/drawable-ldpi/ic_action_settings.png deleted file mode 100644 index c290e590..00000000 Binary files a/res/drawable-ldpi/ic_action_settings.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_action_upload.png b/res/drawable-ldpi/ic_action_upload.png deleted file mode 100644 index 2d4ba56f..00000000 Binary files a/res/drawable-ldpi/ic_action_upload.png and /dev/null differ diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png deleted file mode 100644 index 1bc470be..00000000 Binary files a/res/drawable-ldpi/icon.png and /dev/null differ diff --git a/res/drawable-ldpi/image_fail.png b/res/drawable-ldpi/image_fail.png deleted file mode 100644 index 77513ad2..00000000 Binary files a/res/drawable-ldpi/image_fail.png and /dev/null differ diff --git a/res/drawable-ldpi/winter_holidays_icon.png b/res/drawable-ldpi/winter_holidays_icon.png deleted file mode 100644 index 9261d327..00000000 Binary files a/res/drawable-ldpi/winter_holidays_icon.png and /dev/null differ diff --git a/res/drawable-mdpi/file_text.png b/res/drawable-mdpi/file_text.png new file mode 100644 index 00000000..b8dc0903 Binary files /dev/null and b/res/drawable-mdpi/file_text.png differ diff --git a/res/drawable-xhdpi/file_text.png b/res/drawable-xhdpi/file_text.png new file mode 100644 index 00000000..bf7e9d7a Binary files /dev/null and b/res/drawable-xhdpi/file_text.png differ diff --git a/res/drawable-xxhdpi/file_text.png b/res/drawable-xxhdpi/file_text.png new file mode 100644 index 00000000..9101f466 Binary files /dev/null and b/res/drawable-xxhdpi/file_text.png differ diff --git a/src/com/owncloud/android/utils/MimetypeIconUtil.java b/src/com/owncloud/android/utils/MimetypeIconUtil.java index 2c7f6ee0..bd8c5d91 100644 --- a/src/com/owncloud/android/utils/MimetypeIconUtil.java +++ b/src/com/owncloud/android/utils/MimetypeIconUtil.java @@ -159,7 +159,7 @@ public class MimetypeIconUtil { */ private static void populateMimeTypeIconMapping() { MIMETYPE_TO_ICON_MAPPING.put("application/coreldraw", R.drawable.file_image); - MIMETYPE_TO_ICON_MAPPING.put("application/epub+zip", R.drawable.file_doc); + MIMETYPE_TO_ICON_MAPPING.put("application/epub+zip", R.drawable.file_text); MIMETYPE_TO_ICON_MAPPING.put("application/font-sfnt", R.drawable.file_image); MIMETYPE_TO_ICON_MAPPING.put("application/font-woff", R.drawable.file_image); MIMETYPE_TO_ICON_MAPPING.put("application/illustrator", R.drawable.file_image); @@ -173,7 +173,7 @@ public class MimetypeIconUtil { MIMETYPE_TO_ICON_MAPPING.put("application/postscript", R.drawable.file_image); MIMETYPE_TO_ICON_MAPPING.put("application/pdf", R.drawable.file_pdf); MIMETYPE_TO_ICON_MAPPING.put("application/rss+xml", R.drawable.file_code); - MIMETYPE_TO_ICON_MAPPING.put("application/rtf", R.drawable.file_doc); + MIMETYPE_TO_ICON_MAPPING.put("application/rtf", R.drawable.file); MIMETYPE_TO_ICON_MAPPING.put("application/vnd.android.package-archive", R.drawable.file_zip); MIMETYPE_TO_ICON_MAPPING.put("application/vnd.ms-excel", R.drawable.file_xls); MIMETYPE_TO_ICON_MAPPING.put("application/vnd.ms-excel.addin.macroEnabled.12", R.drawable.file_xls); @@ -205,7 +205,7 @@ public class MimetypeIconUtil { MIMETYPE_TO_ICON_MAPPING.put("application/vnd.openxmlformats-officedocument.wordprocessingml.template", R.drawable.file_doc); MIMETYPE_TO_ICON_MAPPING.put("application/x-7z-compressed", R.drawable.file_zip); MIMETYPE_TO_ICON_MAPPING.put("application/x-bin", R.drawable.file_application); - MIMETYPE_TO_ICON_MAPPING.put("application/x-cbr", R.drawable.file_doc); + MIMETYPE_TO_ICON_MAPPING.put("application/x-cbr", R.drawable.file_text); MIMETYPE_TO_ICON_MAPPING.put("application/x-compressed", R.drawable.file_zip); MIMETYPE_TO_ICON_MAPPING.put("application/x-dcraw", R.drawable.file_image); MIMETYPE_TO_ICON_MAPPING.put("application/x-deb", R.drawable.file_zip); @@ -223,8 +223,8 @@ public class MimetypeIconUtil { MIMETYPE_TO_ICON_MAPPING.put("application/x-rar-compressed", R.drawable.file_zip); MIMETYPE_TO_ICON_MAPPING.put("application/x-shockwave-flash", R.drawable.file_application); MIMETYPE_TO_ICON_MAPPING.put("application/x-tar", R.drawable.file_zip); - MIMETYPE_TO_ICON_MAPPING.put("application/x-tex", R.drawable.file_doc); - MIMETYPE_TO_ICON_MAPPING.put("application/xml", R.drawable.file_code); + MIMETYPE_TO_ICON_MAPPING.put("application/x-tex", R.drawable.file_text); + MIMETYPE_TO_ICON_MAPPING.put("application/xml", R.drawable.file_text); MIMETYPE_TO_ICON_MAPPING.put("application/yaml", R.drawable.file_code); MIMETYPE_TO_ICON_MAPPING.put("application/zip", R.drawable.file_zip); MIMETYPE_TO_ICON_MAPPING.put("database", R.drawable.file); @@ -253,7 +253,7 @@ public class MimetypeIconUtil { MAINMIMETYPE_TO_ICON_MAPPING.put("database", R.drawable.file); MAINMIMETYPE_TO_ICON_MAPPING.put("httpd", R.drawable.file_zip); MAINMIMETYPE_TO_ICON_MAPPING.put("image", R.drawable.file_image); - MAINMIMETYPE_TO_ICON_MAPPING.put("text", R.drawable.file_doc); + MAINMIMETYPE_TO_ICON_MAPPING.put("text", R.drawable.file_text); MAINMIMETYPE_TO_ICON_MAPPING.put("video", R.drawable.file_movie); MAINMIMETYPE_TO_ICON_MAPPING.put("web", R.drawable.file_code); }