diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_album.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_album.png new file mode 100644 index 0000000000000..a1e2b7f9627cc Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_album.png differ diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_generic.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_generic.png new file mode 100644 index 0000000000000..68d973fab87b5 Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_generic.png differ diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_pdf.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_pdf.png index c86b92d0708b8..7e2bef1d367f8 100644 Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_pdf.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_pdf.png differ diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_grid_folder.png b/packages/DocumentsUI/res/drawable-hdpi/ic_grid_folder.png new file mode 100644 index 0000000000000..7c9aee372feeb Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_grid_folder.png differ diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_new_folder.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_new_folder.png index 06adf31a46ab5..490d7ca8bf92b 100644 Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_new_folder.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_new_folder.png differ diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_overflow.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_overflow.png new file mode 100644 index 0000000000000..d49b58f41b13c Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_overflow.png differ diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_popout.png b/packages/DocumentsUI/res/drawable-hdpi/ic_popout.png new file mode 100644 index 0000000000000..f89f8138bef9c Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_popout.png differ diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_album.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_album.png new file mode 100644 index 0000000000000..adf23f421168b Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_album.png differ diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_generic.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_generic.png new file mode 100644 index 0000000000000..f73ab717e2447 Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_generic.png differ diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_pdf.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_pdf.png index ff510968cff16..4fca7111be24c 100644 Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_pdf.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_pdf.png differ diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_grid_folder.png b/packages/DocumentsUI/res/drawable-mdpi/ic_grid_folder.png new file mode 100644 index 0000000000000..7cf91785568a6 Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_grid_folder.png differ diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_overflow.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_overflow.png new file mode 100644 index 0000000000000..795a28d6fbc62 Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_overflow.png differ diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_popout.png b/packages/DocumentsUI/res/drawable-mdpi/ic_popout.png new file mode 100644 index 0000000000000..98a853ff115cc Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_popout.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert.png index d824bb0a1a42a..7d1468a02c3c5 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_album.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_album.png new file mode 100644 index 0000000000000..29e009ed65415 Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_album.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_generic.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_generic.png new file mode 100644 index 0000000000000..82cf876ff0180 Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_generic.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_pdf.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_pdf.png index 518e5916027f8..3e94790f58001 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_pdf.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_pdf.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_folder.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_folder.png new file mode 100644 index 0000000000000..3344980ce631f Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_folder.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy.png index 946e450eeb0ca..614b1e3d4c175 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_new_folder.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_new_folder.png index 4af42d43f101c..f94d3f63cd174 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_new_folder.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_new_folder.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_overflow.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_overflow.png new file mode 100644 index 0000000000000..0603bbfcdb9d3 Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_overflow.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share.png index bdd8e20e96691..1cf6dca225c71 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_undo.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_undo.png index 34a0e33330fdf..0cadd927e4e73 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_undo.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_undo.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_grid.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_grid.png index c955fc3682eca..8ec013c2ba605 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_grid.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_grid.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_list.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_list.png index a23c73aaecce0..45dd72f2618d3 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_list.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_list.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_popout.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_popout.png new file mode 100644 index 0000000000000..3a33bcefb6737 Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_popout.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download.png index f66739d73d58a..6f64d8c132257 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_recent.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_recent.png index 7e24377b362bd..000a5215bc99e 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_recent.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_recent.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_sdcard.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_sdcard.png index 0ce9f9ff6a742..223cff1cba034 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_sdcard.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_sdcard.png differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_usb.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_usb.png index dde7586a945e9..d77023b685326 100644 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_usb.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_usb.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert.png index 887b1b5a3a234..865f3a504ef48 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_album.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_album.png new file mode 100644 index 0000000000000..7515993c9ffaa Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_album.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_generic.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_generic.png new file mode 100644 index 0000000000000..c459556d908c9 Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_generic.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_pdf.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_pdf.png index dd94ddadbffe0..cd46f797acfd1 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_pdf.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_pdf.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_folder.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_folder.png new file mode 100644 index 0000000000000..86a74cdabc51d Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_folder.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy.png index 2a0cfc29f2b28..1f72cce15f791 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_new_folder.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_new_folder.png index fb407077bdc49..038a59780a576 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_new_folder.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_new_folder.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_overflow.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_overflow.png new file mode 100644 index 0000000000000..58f13817ef827 Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_overflow.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share.png index 0a3ac2e3fe191..9084717460904 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_undo.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_undo.png index fd0a194685c4b..eec1b95a08106 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_undo.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_undo.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_grid.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_grid.png index 11ec8da25bbb8..175a76c02768f 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_grid.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_grid.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_list.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_list.png index ed3b0c52518f5..07c7c02196573 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_list.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_list.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_popout.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_popout.png new file mode 100644 index 0000000000000..5f5a86f793f18 Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_popout.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download.png index f22a94a2531a8..d68f9c5aa220d 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_recent.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_recent.png index 09cac0e9cfe73..d95ebb5416d7f 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_recent.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_recent.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_sdcard.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_sdcard.png index 53492525ff119..cc27107856504 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_sdcard.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_sdcard.png differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_usb.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_usb.png index 6deafc70c1dad..15626091d6fee 100644 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_usb.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_usb.png differ diff --git a/packages/DocumentsUI/res/values-sw720dp/styles.xml b/packages/DocumentsUI/res/values-sw720dp/styles.xml index 4ff1c601dd4a6..a581e08bad417 100644 --- a/packages/DocumentsUI/res/values-sw720dp/styles.xml +++ b/packages/DocumentsUI/res/values-sw720dp/styles.xml @@ -16,6 +16,7 @@ + + + diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java index 5b6ec4d87cdb6..4c2c99c2e2c00 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java @@ -781,7 +781,8 @@ public class DirectoryFragment extends Fragment { iconMime.setImageDrawable( IconUtils.loadPackageIcon(context, docAuthority, docIcon)); } else { - iconMime.setImageDrawable(IconUtils.loadMimeIcon(context, docMimeType)); + iconMime.setImageDrawable(IconUtils.loadMimeIcon( + context, docMimeType, docAuthority, docId, state.derivedMode)); } } diff --git a/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java b/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java index 5caf9ba0db29e..1f7386c3695d5 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java +++ b/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java @@ -22,6 +22,7 @@ import android.content.pm.ProviderInfo; import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.provider.DocumentsContract.Document; +import android.util.Log; import com.google.android.collect.Maps; @@ -206,6 +207,27 @@ public class IconUtils { return null; } + public static Drawable loadMimeIcon( + Context context, String mimeType, String authority, String docId, int mode) { + final Resources res = context.getResources(); + + if (Document.MIME_TYPE_DIR.equals(mimeType)) { + // TODO: eventually move these hacky assets into that package + if ("com.android.providers.media.documents".equals(authority) + && docId.startsWith("album")) { + return res.getDrawable(R.drawable.ic_doc_album); + } + + if (mode == DocumentsActivity.State.MODE_GRID) { + return res.getDrawable(R.drawable.ic_grid_folder); + } else { + return res.getDrawable(R.drawable.ic_root_folder); + } + } + + return loadMimeIcon(context, mimeType); + } + public static Drawable loadMimeIcon(Context context, String mimeType) { final Resources res = context.getResources(); @@ -236,8 +258,7 @@ public class IconUtils { } else if ("video".equals(typeOnly)) { return res.getDrawable(R.drawable.ic_doc_video); } else { - // TODO: generic icon? - return null; + return res.getDrawable(R.drawable.ic_doc_generic); } } } diff --git a/packages/DocumentsUI/src/com/android/documentsui/MimePredicate.java b/packages/DocumentsUI/src/com/android/documentsui/MimePredicate.java index 2d96876c0ea8b..9df55a0429299 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/MimePredicate.java +++ b/packages/DocumentsUI/src/com/android/documentsui/MimePredicate.java @@ -80,10 +80,10 @@ public class MimePredicate implements Predicate { } public static boolean mimeMatches(String filter, String test) { - if (filter == null || "*/*".equals(filter)) { - return true; - } else if (test == null) { + if (test == null) { return false; + } else if (filter == null || "*/*".equals(filter)) { + return true; } else if (filter.equals(test)) { return true; } else if (filter.endsWith("/*")) {