diff options
52 files changed, 37 insertions, 7 deletions
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_album.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_album.png Binary files differnew file mode 100644 index 000000000000..a1e2b7f9627c --- /dev/null +++ b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_album.png diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_generic.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_generic.png Binary files differnew file mode 100644 index 000000000000..68d973fab87b --- /dev/null +++ b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_generic.png diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_pdf.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_pdf.png Binary files differindex c86b92d0708b..7e2bef1d367f 100644 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_pdf.png +++ b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_pdf.png diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_grid_folder.png b/packages/DocumentsUI/res/drawable-hdpi/ic_grid_folder.png Binary files differnew file mode 100644 index 000000000000..7c9aee372fee --- /dev/null +++ b/packages/DocumentsUI/res/drawable-hdpi/ic_grid_folder.png diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_new_folder.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_new_folder.png Binary files differindex 06adf31a46ab..490d7ca8bf92 100644 --- a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_new_folder.png +++ b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_new_folder.png diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_overflow.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 000000000000..d49b58f41b13 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_overflow.png diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_popout.png b/packages/DocumentsUI/res/drawable-hdpi/ic_popout.png Binary files differnew file mode 100644 index 000000000000..f89f8138bef9 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-hdpi/ic_popout.png diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_album.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_album.png Binary files differnew file mode 100644 index 000000000000..adf23f421168 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_album.png diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_generic.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_generic.png Binary files differnew file mode 100644 index 000000000000..f73ab717e244 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_generic.png diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_pdf.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_pdf.png Binary files differindex ff510968cff1..4fca7111be24 100644 --- a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_pdf.png +++ b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_pdf.png diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_grid_folder.png b/packages/DocumentsUI/res/drawable-mdpi/ic_grid_folder.png Binary files differnew file mode 100644 index 000000000000..7cf91785568a --- /dev/null +++ b/packages/DocumentsUI/res/drawable-mdpi/ic_grid_folder.png diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_overflow.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 000000000000..795a28d6fbc6 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_overflow.png diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_popout.png b/packages/DocumentsUI/res/drawable-mdpi/ic_popout.png Binary files differnew file mode 100644 index 000000000000..98a853ff115c --- /dev/null +++ b/packages/DocumentsUI/res/drawable-mdpi/ic_popout.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert.png Binary files differindex d824bb0a1a42..7d1468a02c3c 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_album.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_album.png Binary files differnew file mode 100644 index 000000000000..29e009ed6541 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_album.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_generic.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_generic.png Binary files differnew file mode 100644 index 000000000000..82cf876ff018 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_generic.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_pdf.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_pdf.png Binary files differindex 518e5916027f..3e94790f5800 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_pdf.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_pdf.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_folder.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_folder.png Binary files differnew file mode 100644 index 000000000000..3344980ce631 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_folder.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy.png Binary files differindex 946e450eeb0c..614b1e3d4c17 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_new_folder.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_new_folder.png Binary files differindex 4af42d43f101..f94d3f63cd17 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_new_folder.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_new_folder.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_overflow.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 000000000000..0603bbfcdb9d --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_overflow.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share.png Binary files differindex bdd8e20e9669..1cf6dca225c7 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_undo.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_undo.png Binary files differindex 34a0e33330fd..0cadd927e4e7 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_undo.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_undo.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_grid.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_grid.png Binary files differindex c955fc3682ec..8ec013c2ba60 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_grid.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_grid.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_list.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_list.png Binary files differindex a23c73aaecce..45dd72f2618d 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_list.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_view_list.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_popout.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_popout.png Binary files differnew file mode 100644 index 000000000000..3a33bcefb673 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_popout.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download.png Binary files differindex f66739d73d58..6f64d8c13225 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_recent.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_recent.png Binary files differindex 7e24377b362b..000a5215bc99 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_recent.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_recent.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_sdcard.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_sdcard.png Binary files differindex 0ce9f9ff6a74..223cff1cba03 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_sdcard.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_sdcard.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_usb.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_usb.png Binary files differindex dde7586a945e..d77023b68532 100644 --- a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_usb.png +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_usb.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert.png Binary files differindex 887b1b5a3a23..865f3a504ef4 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_album.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_album.png Binary files differnew file mode 100644 index 000000000000..7515993c9ffa --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_album.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_generic.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_generic.png Binary files differnew file mode 100644 index 000000000000..c459556d908c --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_generic.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_pdf.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_pdf.png Binary files differindex dd94ddadbffe..cd46f797acfd 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_pdf.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_pdf.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_folder.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_folder.png Binary files differnew file mode 100644 index 000000000000..86a74cdabc51 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_folder.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy.png Binary files differindex 2a0cfc29f2b2..1f72cce15f79 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_new_folder.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_new_folder.png Binary files differindex fb407077bdc4..038a59780a57 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_new_folder.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_new_folder.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_overflow.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 000000000000..58f13817ef82 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_overflow.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share.png Binary files differindex 0a3ac2e3fe19..908471746090 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_undo.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_undo.png Binary files differindex fd0a194685c4..eec1b95a0810 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_undo.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_undo.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_grid.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_grid.png Binary files differindex 11ec8da25bbb..175a76c02768 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_grid.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_grid.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_list.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_list.png Binary files differindex ed3b0c52518f..07c7c0219657 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_list.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_view_list.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_popout.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_popout.png Binary files differnew file mode 100644 index 000000000000..5f5a86f793f1 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_popout.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download.png Binary files differindex f22a94a2531a..d68f9c5aa220 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_recent.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_recent.png Binary files differindex 09cac0e9cfe7..d95ebb5416d7 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_recent.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_recent.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_sdcard.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_sdcard.png Binary files differindex 53492525ff11..cc2710785650 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_sdcard.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_sdcard.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_usb.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_usb.png Binary files differindex 6deafc70c1da..15626091d6fe 100644 --- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_usb.png +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_usb.png diff --git a/packages/DocumentsUI/res/values-sw720dp/styles.xml b/packages/DocumentsUI/res/values-sw720dp/styles.xml index 4ff1c601dd4a..a581e08bad41 100644 --- a/packages/DocumentsUI/res/values-sw720dp/styles.xml +++ b/packages/DocumentsUI/res/values-sw720dp/styles.xml @@ -16,6 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="Theme" parent="@android:style/Theme.Holo.Light"> + <item name="android:actionOverflowButtonStyle">@style/DarkerOverflow</item> <item name="android:windowBackground">@*android:drawable/dialog_full_holo_light</item> <item name="android:colorBackgroundCacheHint">@null</item> <item name="android:windowIsTranslucent">true</item> diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml index 945e7ae6e5a5..0c8f7127811a 100644 --- a/packages/DocumentsUI/res/values/styles.xml +++ b/packages/DocumentsUI/res/values/styles.xml @@ -29,5 +29,12 @@ <!-- Normally just a redirection, but this is used to make ourselves a dialog on large tablets --> - <style name="Theme" parent="@android:style/Theme.Holo.Light" /> + <style name="Theme" parent="@android:style/Theme.Holo.Light"> + <item name="android:actionOverflowButtonStyle">@style/DarkerOverflow</item> + </style> + + <style name="DarkerOverflow" parent="@android:style/Widget.Holo.Light.ActionButton.Overflow"> + <item name="android:src">@drawable/ic_menu_overflow</item> + </style> + </resources> diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java index 5b6ec4d87cdb..4c2c99c2e2c0 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 5caf9ba0db29..1f7386c3695d 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 2d96876c0ea8..9df55a042929 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<DocumentInfo> { } 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("/*")) { |
