diff --git a/packages/DocumentsUI/Android.mk b/packages/DocumentsUI/Android.mk
index 79009532f3159..2f97809c1818b 100644
--- a/packages/DocumentsUI/Android.mk
+++ b/packages/DocumentsUI/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 guava
diff --git a/packages/DocumentsUI/res/drawable-hdpi/drawer_shadow.9.png b/packages/DocumentsUI/res/drawable-hdpi/drawer_shadow.9.png
deleted file mode 100644
index 224cc4ff43a29..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-hdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_breadcrumb_arrow.png b/packages/DocumentsUI/res/drawable-hdpi/ic_breadcrumb_arrow.png
new file mode 100644
index 0000000000000..8a170b04b8e74
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_breadcrumb_arrow.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_cab_accept.png b/packages/DocumentsUI/res/drawable-hdpi/ic_cab_accept.png
index 234ca8a41f228..a7726e7da762d 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_cab_accept.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_cab_accept.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_cab_cancel.png b/packages/DocumentsUI/res/drawable-hdpi/ic_cab_cancel.png
new file mode 100644
index 0000000000000..658a6ddce4f32
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_cab_cancel.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_cab_remove_field_holo_light.png b/packages/DocumentsUI/res/drawable-hdpi/ic_cab_remove_field_holo_light.png
deleted file mode 100644
index c9fa5c61d0a50..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_cab_remove_field_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_cab_select_item.png b/packages/DocumentsUI/res/drawable-hdpi/ic_cab_select_item.png
index e9bd0105f1b5e..57b3069b24b54 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_cab_select_item.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_cab_select_item.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_dialog_alert.png b/packages/DocumentsUI/res/drawable-hdpi/ic_dialog_alert.png
new file mode 100644
index 0000000000000..40b4326e915aa
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_dialog_alert.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_dir.png b/packages/DocumentsUI/res/drawable-hdpi/ic_dir.png
deleted file mode 100644
index aabeda688c615..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_dir.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_apk.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_apk.png
index 5bda872ab1249..36fccad99c7a9 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_apk.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_apk.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_audio.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_audio.png
index 38e315a66f47f..3aba859ed8d2f 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_audio.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_audio.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_certificate.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_certificate.png
index c6e95827cf0ab..778f9ba2d39e7 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_certificate.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_certificate.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_codes.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_codes.png
index c5a748b102017..65b03d183bdec 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_codes.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_codes.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_compressed.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_compressed.png
index a59bd235d5dec..e9719b86ddc1c 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_compressed.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_compressed.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_contact.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_contact.png
index 87799c69daed3..4b2107c4ad705 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_contact.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_contact.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_event.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_event.png
index a3bbc0ffeb40d..9ca3b359c7f4a 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_event.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_event.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_font.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_font.png
index 56133d4677e98..dc3bebcece5e1 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_font.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_font.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_image.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_image.png
index e655d0480c2fc..69afe0664ee85 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_image.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_image.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 9ce032f8b1b36..c86b92d0708b8 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_doc_presentation.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_presentation.png
index 53bfc52d491c6..9b9729b95007f 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_presentation.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_presentation.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_spreadsheet.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_spreadsheet.png
index 5a49de8493e56..ab917cefa2a55 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_spreadsheet.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_spreadsheet.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_text.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_text.png
index af79de900d7d3..9b96b2f792950 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_text.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_text.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_video.png b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_video.png
index a0676d70c943e..89a0d37e61b2e 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_doc_video.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_doc_video.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_drawer_shadow.9.png b/packages/DocumentsUI/res/drawable-hdpi/ic_drawer_shadow.9.png
new file mode 100644
index 0000000000000..594ce697884d0
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_drawer_shadow.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_drawer_shadow_tablet.9.png b/packages/DocumentsUI/res/drawable-hdpi/ic_drawer_shadow_tablet.9.png
new file mode 100644
index 0000000000000..6ee47a9cd9e7c
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_drawer_shadow_tablet.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_grid_card_background.9.png b/packages/DocumentsUI/res/drawable-hdpi/ic_grid_card_background.9.png
new file mode 100644
index 0000000000000..8797e942c73ab
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_grid_card_background.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_grid_gradient_bg.9.png b/packages/DocumentsUI/res/drawable-hdpi/ic_grid_gradient_bg.9.png
new file mode 100644
index 0000000000000..4b9eeb0eacaad
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_grid_gradient_bg.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_copy.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_copy.png
new file mode 100644
index 0000000000000..85b60acdc4955
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_copy.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_delete.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_delete.png
new file mode 100644
index 0000000000000..3a039e097590a
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_delete.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_disconnect.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_disconnect.png
index 4736da16d75d2..164d2de4b94b4 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_disconnect.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_disconnect.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_edit_holo.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_edit_holo.png
deleted file mode 100644
index 50ac93550a88f..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_edit_holo.png and /dev/null 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 00faf9ddf4620..06adf31a46ab5 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_rename.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_rename.png
new file mode 100644
index 0000000000000..e8b000ceefe71
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_rename.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_search.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_search.png
new file mode 100644
index 0000000000000..a5ed309adb25c
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_search.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_search_holo_light.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_search_holo_light.png
deleted file mode 100644
index cc661e3ae1f9b..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_search_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_settings.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_settings.png
new file mode 100644
index 0000000000000..2406366009649
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_settings.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_share.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_share.png
new file mode 100644
index 0000000000000..61b709972544e
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_share.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_share_holo_light_icononly.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_share_holo_light_icononly.png
deleted file mode 100644
index 527e43c8e7725..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_share_holo_light_icononly.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby.png
new file mode 100644
index 0000000000000..05df3d7baaee9
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby_holo_light.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby_holo_light.png
deleted file mode 100644
index 9421792d9e761..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_trash_holo_light.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_trash_holo_light.png
deleted file mode 100644
index f662f94aa8d17..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_trash_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_revert_holo_light.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_undo.png
similarity index 84%
rename from packages/DocumentsUI/res/drawable-hdpi/ic_menu_revert_holo_light.png
rename to packages/DocumentsUI/res/drawable-hdpi/ic_menu_undo.png
index e9c0b01d7a149..6ac9dc184581f 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_revert_holo_light.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_undo.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_grid.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_grid.png
index 2c59d609597d7..0779f5c5537c5 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_grid.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_grid.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_list.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_list.png
index 0dbb0750d7be6..ab7e5cb0afc86 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_list.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_view_list.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_open.png b/packages/DocumentsUI/res/drawable-hdpi/ic_open.png
new file mode 100644
index 0000000000000..17f4a4143d612
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_open.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_perm_group_system_tools.png b/packages/DocumentsUI/res/drawable-hdpi/ic_perm_group_system_tools.png
deleted file mode 100644
index 3905d0e93d693..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_perm_group_system_tools.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_root_download.png b/packages/DocumentsUI/res/drawable-hdpi/ic_root_download.png
index e927efa781846..baf581064eb29 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_root_download.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_root_download.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_root_folder.png b/packages/DocumentsUI/res/drawable-hdpi/ic_root_folder.png
new file mode 100644
index 0000000000000..4ee96b967f999
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_root_folder.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_root_recent.png b/packages/DocumentsUI/res/drawable-hdpi/ic_root_recent.png
index d23e617b2cc7a..5374e277608e8 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_root_recent.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_root_recent.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_root_sdcard.png b/packages/DocumentsUI/res/drawable-hdpi/ic_root_sdcard.png
new file mode 100644
index 0000000000000..caf580300dea3
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_root_sdcard.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_root_usb.png b/packages/DocumentsUI/res/drawable-hdpi/ic_root_usb.png
index d8c51d73e7063..cfa69f1cdcdfe 100644
Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_root_usb.png and b/packages/DocumentsUI/res/drawable-hdpi/ic_root_usb.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_subdirectory_arrow.png b/packages/DocumentsUI/res/drawable-hdpi/ic_subdirectory_arrow.png
new file mode 100644
index 0000000000000..f5c5f1843d3ba
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-hdpi/ic_subdirectory_arrow.png differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/stat_notify_sdcard_light.png b/packages/DocumentsUI/res/drawable-hdpi/stat_notify_sdcard_light.png
deleted file mode 100644
index 9c9a7de5001cb..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-hdpi/stat_notify_sdcard_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_breadcrumb_arrow.png b/packages/DocumentsUI/res/drawable-mdpi/ic_breadcrumb_arrow.png
new file mode 100644
index 0000000000000..623d9db50e608
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_breadcrumb_arrow.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_cab_accept.png b/packages/DocumentsUI/res/drawable-mdpi/ic_cab_accept.png
index ad761e13c543e..11779bbc1da5b 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_cab_accept.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_cab_accept.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_cab_cancel.png b/packages/DocumentsUI/res/drawable-mdpi/ic_cab_cancel.png
new file mode 100644
index 0000000000000..bebd8030b6da6
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_cab_cancel.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_cab_remove_field_holo_light.png b/packages/DocumentsUI/res/drawable-mdpi/ic_cab_remove_field_holo_light.png
deleted file mode 100644
index 7c29b715bb4e2..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_cab_remove_field_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_cab_select_item.png b/packages/DocumentsUI/res/drawable-mdpi/ic_cab_select_item.png
index dff246a677bec..af2412f7a1ae2 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_cab_select_item.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_cab_select_item.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_dialog_alert.png b/packages/DocumentsUI/res/drawable-mdpi/ic_dialog_alert.png
new file mode 100644
index 0000000000000..b092ea09558fc
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_dialog_alert.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_apk.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_apk.png
index 26212e9a81033..1c6f8d154c9bb 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_apk.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_apk.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_audio.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_audio.png
index db9fa8bd977a5..40cdc7672413a 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_audio.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_audio.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_certificate.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_certificate.png
index 87877fe618af5..94339f4d6941e 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_certificate.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_certificate.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_codes.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_codes.png
index d552234cfddbe..a84490c9500f4 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_codes.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_codes.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_compressed.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_compressed.png
index 75c304a51f54d..f827d6d93c396 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_compressed.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_compressed.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_contact.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_contact.png
index 849d8e745e7fe..33f1367f73858 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_contact.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_contact.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_event.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_event.png
index 43044896cc673..65977857318bd 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_event.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_event.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_font.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_font.png
index e1ad89f7fb10e..8b1cded3b9f26 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_font.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_font.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_image.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_image.png
index 914ed4b751048..021743058d60e 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_image.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_image.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 dfdeb264b373b..ff510968cff16 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_doc_presentation.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_presentation.png
index 0bcbca4259bf3..08605521606fd 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_presentation.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_presentation.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_spreadsheet.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_spreadsheet.png
index 9e00ea103ff4e..7431e83d3d9e6 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_spreadsheet.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_spreadsheet.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_text.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_text.png
index e2caba79d2918..c540a80ce1117 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_text.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_text.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_video.png b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_video.png
index 6393df6762fed..ab0222a5d4f93 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_doc_video.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_doc_video.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_drawer_shadow.9.png b/packages/DocumentsUI/res/drawable-mdpi/ic_drawer_shadow.9.png
new file mode 100644
index 0000000000000..99a302695fa70
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_drawer_shadow.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_drawer_shadow_tablet.9.png b/packages/DocumentsUI/res/drawable-mdpi/ic_drawer_shadow_tablet.9.png
new file mode 100644
index 0000000000000..b85d70be757f3
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_drawer_shadow_tablet.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_grid_card_background.9.png b/packages/DocumentsUI/res/drawable-mdpi/ic_grid_card_background.9.png
new file mode 100644
index 0000000000000..d632b585ed908
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_grid_card_background.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_grid_gradient_bg.9.png b/packages/DocumentsUI/res/drawable-mdpi/ic_grid_gradient_bg.9.png
new file mode 100644
index 0000000000000..792b269c7c47e
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_grid_gradient_bg.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_copy.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_copy.png
new file mode 100644
index 0000000000000..ea1ea522d76f7
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_copy.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_delete.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_delete.png
new file mode 100644
index 0000000000000..9992321331514
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_delete.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_disconnect.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_disconnect.png
index 64e8592fe2556..cb09782340106 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_disconnect.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_disconnect.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_edit_holo.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_edit_holo.png
deleted file mode 100644
index 8a2af67f84eb8..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_edit_holo.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_new_folder.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_new_folder.png
index 2b7e5caecfdda..65dfaa6c3b754 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_new_folder.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_new_folder.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_rename.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_rename.png
new file mode 100644
index 0000000000000..a56b7763995f5
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_rename.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_search.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_search.png
new file mode 100644
index 0000000000000..4e442403965b9
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_search.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_search_holo_light.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_search_holo_light.png
deleted file mode 100644
index 0350a43b82e7b..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_search_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_settings.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_settings.png
new file mode 100644
index 0000000000000..67f8e4d467dc5
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_settings.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_share.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_share.png
new file mode 100644
index 0000000000000..ecd5a172863d7
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_share.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_share_holo_light_icononly.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_share_holo_light_icononly.png
deleted file mode 100644
index a15ef6abc98a4..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_share_holo_light_icononly.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby.png
new file mode 100644
index 0000000000000..549a381c5e804
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby_holo_light.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby_holo_light.png
deleted file mode 100644
index 9d724f4de37e8..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_trash_holo_light.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_trash_holo_light.png
deleted file mode 100644
index 3cc00bbfa23e5..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_trash_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_revert_holo_light.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_undo.png
similarity index 80%
rename from packages/DocumentsUI/res/drawable-mdpi/ic_menu_revert_holo_light.png
rename to packages/DocumentsUI/res/drawable-mdpi/ic_menu_undo.png
index 5d7e1a5fb9036..43b7220132621 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_revert_holo_light.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_undo.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_grid.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_grid.png
index b6d1a9a1f6eba..0e40d89f7c817 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_grid.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_grid.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_list.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_list.png
index 714d5e83e3f9a..d0c171747c72f 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_list.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_view_list.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_open.png b/packages/DocumentsUI/res/drawable-mdpi/ic_open.png
new file mode 100644
index 0000000000000..56cfa49d1d88d
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_open.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_perm_group_system_tools.png b/packages/DocumentsUI/res/drawable-mdpi/ic_perm_group_system_tools.png
deleted file mode 100644
index 5d9d978dbdf5f..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_perm_group_system_tools.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_root_download.png b/packages/DocumentsUI/res/drawable-mdpi/ic_root_download.png
index 110d78d1126ba..60ebeef6e886a 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_root_download.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_root_download.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_root_folder.png b/packages/DocumentsUI/res/drawable-mdpi/ic_root_folder.png
new file mode 100644
index 0000000000000..944de5b8f24ea
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_root_folder.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_root_recent.png b/packages/DocumentsUI/res/drawable-mdpi/ic_root_recent.png
index 47c4f29fd21fd..45f7e0b5553d6 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_root_recent.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_root_recent.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_root_sdcard.png b/packages/DocumentsUI/res/drawable-mdpi/ic_root_sdcard.png
new file mode 100644
index 0000000000000..3b065f3acb990
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_root_sdcard.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_root_usb.png b/packages/DocumentsUI/res/drawable-mdpi/ic_root_usb.png
index be47b989ef5b2..fb83d5d744e87 100644
Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_root_usb.png and b/packages/DocumentsUI/res/drawable-mdpi/ic_root_usb.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_subdirectory_arrow.png b/packages/DocumentsUI/res/drawable-mdpi/ic_subdirectory_arrow.png
new file mode 100644
index 0000000000000..276f00da8cd68
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-mdpi/ic_subdirectory_arrow.png differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/stat_notify_sdcard_light.png b/packages/DocumentsUI/res/drawable-mdpi/stat_notify_sdcard_light.png
deleted file mode 100644
index 39dd0fa197a0a..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-mdpi/stat_notify_sdcard_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_breadcrumb_arrow.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_breadcrumb_arrow.png
new file mode 100644
index 0000000000000..9109320fad153
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_breadcrumb_arrow.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_accept.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_accept.png
index 47398d336219e..89e580b4c8110 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_accept.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_accept.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_cancel.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_cancel.png
new file mode 100644
index 0000000000000..d35b8021ab599
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_cancel.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_remove_field_holo_light.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_remove_field_holo_light.png
deleted file mode 100644
index 2959e5ea26066..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_remove_field_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_select_item.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_select_item.png
index 2b4891c8453be..254cb18806ea2 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_select_item.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_cab_select_item.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert.png
new file mode 100644
index 0000000000000..d824bb0a1a42a
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_dialog_alert.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_apk.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_apk.png
index 5abdd4c01ada3..baded5e440607 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_apk.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_apk.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_audio.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_audio.png
index 7975acd6a012e..908aafb0b5050 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_audio.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_audio.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_certificate.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_certificate.png
index 59a7305916aeb..1c3dee4b1cb22 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_certificate.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_certificate.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_codes.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_codes.png
index 468431e09c99d..a06820956795a 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_codes.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_codes.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_compressed.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_compressed.png
index 4db47a6eec190..af0e36da2ffb6 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_compressed.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_compressed.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_contact.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_contact.png
index ded1a00399b66..e6833dc1dce9d 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_contact.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_contact.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_event.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_event.png
index 46094633651e6..ff67036ef6da9 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_event.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_event.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_font.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_font.png
index dda7f069b80b5..aaca230b951da 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_font.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_font.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_image.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_image.png
index 44b40f70197ac..5221393cb6b72 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_image.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_image.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 a59b10296f8d2..518e5916027f8 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_doc_presentation.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_presentation.png
index 062fe03966560..5c4edf6ef033f 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_presentation.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_presentation.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_spreadsheet.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_spreadsheet.png
index 82bda589d4e11..d10dcf7a7e89e 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_spreadsheet.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_spreadsheet.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_text.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_text.png
index 6f15709110fbd..f15cdfbaedb53 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_text.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_text.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_video.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_video.png
index cdd80520e00d5..f751be7c9bff6 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_video.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_doc_video.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_drawer_shadow.9.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_drawer_shadow.9.png
new file mode 100644
index 0000000000000..96acf3560925e
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_drawer_shadow.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_drawer_shadow_tablet.9.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_drawer_shadow_tablet.9.png
new file mode 100644
index 0000000000000..d21193accd76c
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_drawer_shadow_tablet.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_card_background.9.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_card_background.9.png
new file mode 100644
index 0000000000000..2655912c2ee06
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_card_background.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_gradient_bg.9.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_gradient_bg.9.png
new file mode 100644
index 0000000000000..450a486616d3a
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_gradient_bg.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy.png
new file mode 100644
index 0000000000000..946e450eeb0ca
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_copy.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_delete.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_delete.png
new file mode 100644
index 0000000000000..7ab538f60aada
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_delete.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_disconnect.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_disconnect.png
index a96a0f877ce0c..904672a06dce0 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_disconnect.png and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_disconnect.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_edit_holo.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_edit_holo.png
deleted file mode 100644
index 4652da60cac38..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_edit_holo.png and /dev/null 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 449ae53d13a47..4af42d43f101c 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_rename.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_rename.png
new file mode 100644
index 0000000000000..b63b70cf71604
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_rename.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_search.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_search.png
new file mode 100644
index 0000000000000..9dd1938fbf59e
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_search.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_search_holo_light.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_search_holo_light.png
deleted file mode 100644
index 6811782714413..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_search_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_settings.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_settings.png
new file mode 100644
index 0000000000000..bba370e971546
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_settings.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share.png
new file mode 100644
index 0000000000000..bdd8e20e96691
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share_holo_light_icononly.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share_holo_light_icononly.png
deleted file mode 100644
index 939ea21224c30..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_share_holo_light_icononly.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby.png
new file mode 100644
index 0000000000000..a23bee493bcef
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby_holo_light.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby_holo_light.png
deleted file mode 100644
index 5241a30bddb30..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_trash_holo_light.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_trash_holo_light.png
deleted file mode 100644
index c985a278f9d6a..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_trash_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_revert_holo_light.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_undo.png
similarity index 88%
rename from packages/DocumentsUI/res/drawable-xhdpi/ic_menu_revert_holo_light.png
rename to packages/DocumentsUI/res/drawable-xhdpi/ic_menu_undo.png
index ca67f6240e952..34a0e33330fdf 100644
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_revert_holo_light.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 b219d060671a8..c955fc3682eca 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 897740eb60d53..a23c73aaecce0 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_open.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_open.png
new file mode 100644
index 0000000000000..b64d8f1fdceba
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_open.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_perm_group_system_tools.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_perm_group_system_tools.png
deleted file mode 100644
index 5dc35da66bb12..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_perm_group_system_tools.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_download.png
index 2c30b7f73bc8e..f66739d73d58a 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_folder.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_folder.png
new file mode 100644
index 0000000000000..4d5564cf9ed87
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_root_folder.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 a87ccb8f6f446..7e24377b362bd 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
new file mode 100644
index 0000000000000..0ce9f9ff6a742
Binary files /dev/null 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 116da46288f89..dde7586a945e9 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-xhdpi/ic_subdirectory_arrow.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_subdirectory_arrow.png
new file mode 100644
index 0000000000000..7f3364d65d1a7
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xhdpi/ic_subdirectory_arrow.png differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/stat_notify_sdcard_light.png b/packages/DocumentsUI/res/drawable-xhdpi/stat_notify_sdcard_light.png
deleted file mode 100644
index 671a204f771cd..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xhdpi/stat_notify_sdcard_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_breadcrumb_arrow.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_breadcrumb_arrow.png
new file mode 100644
index 0000000000000..06681e3c1c351
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_breadcrumb_arrow.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_accept.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_accept.png
index ca5b1acd57ba7..ac88818c154bd 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_accept.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_accept.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_cancel.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_cancel.png
new file mode 100644
index 0000000000000..88356c7c03b60
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_cancel.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_remove_field_holo_light.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_remove_field_holo_light.png
deleted file mode 100644
index 953438d583bff..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_remove_field_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_select_item.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_select_item.png
index 8679156a714e5..75658db58dc03 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_select_item.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_cab_select_item.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert.png
new file mode 100644
index 0000000000000..887b1b5a3a234
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_dialog_alert.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_apk.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_apk.png
index 45bce0860b6e7..4eaf6ce690cce 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_apk.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_apk.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_audio.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_audio.png
index e23269741f12a..3659f4a2984fe 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_audio.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_audio.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_certificate.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_certificate.png
index efcaa87bee43a..68e619e6c45da 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_certificate.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_certificate.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_codes.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_codes.png
index edaf35e55dff0..0ec4e8677ab46 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_codes.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_codes.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_compressed.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_compressed.png
index 73f6a1b0e24f8..bf49d787fcc2a 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_compressed.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_compressed.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_contact.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_contact.png
index 7f93d7644baff..bdd99d698f633 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_contact.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_contact.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_event.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_event.png
index 55cb3ecc1e73c..77a0faec5c50a 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_event.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_event.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_font.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_font.png
index 62b612ab7a1f6..30d2c4c383c5a 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_font.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_font.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_image.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_image.png
index 1a5c481ab85d7..5991968972519 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_image.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_image.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 29d0b33dab1fb..dd94ddadbffe0 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_doc_presentation.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_presentation.png
index cec53f2206427..c09d6ab855c3f 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_presentation.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_presentation.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_spreadsheet.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_spreadsheet.png
index 220bddb465e1c..2170e666d1fac 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_spreadsheet.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_spreadsheet.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_text.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_text.png
index 76a1bb523b1a2..84960b9a901a7 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_text.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_text.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_video.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_video.png
index 20e23c9d36f53..42d8ec174bef1 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_video.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_doc_video.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_drawer_shadow.9.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_drawer_shadow.9.png
new file mode 100644
index 0000000000000..97fd9d6c81d2c
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_drawer_shadow.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_drawer_shadow_tablet.9.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_drawer_shadow_tablet.9.png
new file mode 100644
index 0000000000000..3c9579097fdfa
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_drawer_shadow_tablet.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_card_background.9.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_card_background.9.png
new file mode 100644
index 0000000000000..7bbaf9dc4f7c4
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_card_background.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_gradient_bg.9.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_gradient_bg.9.png
new file mode 100644
index 0000000000000..988c85630ded8
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_gradient_bg.9.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy.png
new file mode 100644
index 0000000000000..2a0cfc29f2b28
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_copy.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_delete.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_delete.png
new file mode 100644
index 0000000000000..f4dca7f0bea8f
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_delete.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_disconnect.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_disconnect.png
index aeace05058031..676d0f76972b9 100644
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_disconnect.png and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_disconnect.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_edit_holo.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_edit_holo.png
deleted file mode 100644
index 71bcdbff6d04a..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_edit_holo.png and /dev/null 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 073744229b66f..fb407077bdc49 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_rename.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_rename.png
new file mode 100644
index 0000000000000..140abba0f8c6c
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_rename.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_revert_holo_light.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_revert_holo_light.png
deleted file mode 100644
index ced603248479b..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_revert_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_search.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_search.png
new file mode 100644
index 0000000000000..6079806c2df0a
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_search.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_search_holo_light.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_search_holo_light.png
deleted file mode 100644
index c69d52630e9ce..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_search_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_settings.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_settings.png
new file mode 100644
index 0000000000000..ecd7de143c6fa
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_settings.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share.png
new file mode 100644
index 0000000000000..0a3ac2e3fe191
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share_holo_light_icononly.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share_holo_light_icononly.png
deleted file mode 100644
index a3f9a5c8d0a74..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_share_holo_light_icononly.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby.png
new file mode 100644
index 0000000000000..358f97a24e885
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby_holo_light.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby_holo_light.png
deleted file mode 100644
index 9810a1e79a948..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_trash_holo_light.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_trash_holo_light.png
deleted file mode 100644
index 1811be8d45899..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_trash_holo_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_undo.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_undo.png
new file mode 100644
index 0000000000000..fd0a194685c4b
Binary files /dev/null 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 2c58b5e48ec49..11ec8da25bbb8 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 cf320cdf56610..ed3b0c52518f5 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_open.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_open.png
new file mode 100644
index 0000000000000..b467962459bfe
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_open.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_perm_group_system_tools.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_perm_group_system_tools.png
deleted file mode 100644
index cee2b058eca96..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_perm_group_system_tools.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_download.png
index f9fe2bef66915..f22a94a2531a8 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_folder.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_folder.png
new file mode 100644
index 0000000000000..077c851cee28e
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_root_folder.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 d95ebb5416d7f..09cac0e9cfe73 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
new file mode 100644
index 0000000000000..53492525ff119
Binary files /dev/null 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 6fbc3c870dac6..6deafc70c1dad 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/drawable-xxhdpi/ic_subdirectory_arrow.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_subdirectory_arrow.png
new file mode 100644
index 0000000000000..8710c683666b7
Binary files /dev/null and b/packages/DocumentsUI/res/drawable-xxhdpi/ic_subdirectory_arrow.png differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/stat_notify_sdcard_light.png b/packages/DocumentsUI/res/drawable-xxhdpi/stat_notify_sdcard_light.png
deleted file mode 100644
index 8b8b22732051c..0000000000000
Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/stat_notify_sdcard_light.png and /dev/null differ
diff --git a/packages/DocumentsUI/res/menu/activity.xml b/packages/DocumentsUI/res/menu/activity.xml
index 4d3dc56fb48ae..6c37a4e37ffe9 100644
--- a/packages/DocumentsUI/res/menu/activity.xml
+++ b/packages/DocumentsUI/res/menu/activity.xml
@@ -23,14 +23,14 @@
-
diff --git a/packages/DocumentsUI/res/xml/document_provider.xml b/packages/DocumentsUI/res/xml/document_provider.xml
deleted file mode 100644
index 77891cbccaa1d..0000000000000
--- a/packages/DocumentsUI/res/xml/document_provider.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
index ba47037e4bbab..ba464f750c6b5 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
@@ -477,13 +477,11 @@ public class DirectoryFragment extends Fragment {
if (extras != null) {
final String info = extras.getString(DocumentsContract.EXTRA_INFO);
if (info != null) {
- mFooters.add(new MessageFooter(
- com.android.internal.R.drawable.ic_menu_info_details, info));
+ mFooters.add(new MessageFooter(R.drawable.ic_dialog_alert, info));
}
final String error = extras.getString(DocumentsContract.EXTRA_ERROR);
if (error != null) {
- mFooters.add(new MessageFooter(
- com.android.internal.R.drawable.ic_dialog_alert, error));
+ mFooters.add(new MessageFooter(R.drawable.ic_dialog_alert, error));
}
if (extras.getBoolean(DocumentsContract.EXTRA_LOADING, false)) {
mFooters.add(new LoadingFooter());
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
index 8715055c7d8cd..e1f2606dc332a 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
@@ -104,7 +104,7 @@ public class DocumentsActivity extends Activity {
R.drawable.ic_drawer, R.string.drawer_open, R.string.drawer_close);
mDrawerLayout.setDrawerListener(mDrawerListener);
- mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
+ mDrawerLayout.setDrawerShadow(R.drawable.ic_drawer_shadow, GravityCompat.START);
if (icicle != null) {
mState = icicle.getParcelable(EXTRA_STATE);
diff --git a/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java b/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java
index b5b10334fc8aa..5caf9ba0db29e 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/IconUtils.java
@@ -210,7 +210,8 @@ public class IconUtils {
final Resources res = context.getResources();
if (Document.MIME_TYPE_DIR.equals(mimeType)) {
- return res.getDrawable(R.drawable.ic_dir);
+ // TODO: return a mipmap, since this is used for grid
+ return res.getDrawable(R.drawable.ic_root_folder);
}
// Look for exact match first
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
index d192378ea71ec..d4f1b393f5255 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
@@ -72,7 +72,7 @@ public class RootsCache {
// Create special root for recents
final RootInfo root = new RootInfo();
root.rootType = Root.ROOT_TYPE_SHORTCUT;
- root.icon = R.drawable.ic_dir;
+ root.icon = R.drawable.ic_root_recent;
root.flags = Root.FLAG_LOCAL_ONLY | Root.FLAG_SUPPORTS_CREATE;
root.title = mContext.getString(R.string.root_recent);
root.availableBytes = -1;
@@ -151,8 +151,12 @@ public class RootsCache {
@GuardedBy("ActivityThread")
public List getMatchingRoots(State state) {
+ return getMatchingRoots(mRoots, state);
+ }
+
+ public static List getMatchingRoots(List roots, State state) {
ArrayList matching = Lists.newArrayList();
- for (RootInfo root : mRoots) {
+ for (RootInfo root : roots) {
final boolean supportsCreate = (root.flags & Root.FLAG_SUPPORTS_CREATE) != 0;
final boolean advanced = (root.flags & Root.FLAG_ADVANCED) != 0;
final boolean localOnly = (root.flags & Root.FLAG_LOCAL_ONLY) != 0;
@@ -165,7 +169,9 @@ public class RootsCache {
if (state.localOnly && !localOnly) continue;
// Only include roots that serve requested content
- if (!MimePredicate.mimeMatches(root.mimeTypes, state.acceptMimes)) {
+ final boolean overlap = MimePredicate.mimeMatches(root.mimeTypes, state.acceptMimes)
+ || MimePredicate.mimeMatches(state.acceptMimes, root.mimeTypes);
+ if (!overlap) {
continue;
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
index 75baa0ac5725c..a6ddf70d163dd 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java
@@ -26,6 +26,7 @@ import android.graphics.drawable.Drawable;
import android.provider.DocumentsContract.Root;
import com.android.documentsui.IconUtils;
+import com.android.documentsui.R;
import java.util.Objects;
@@ -38,6 +39,7 @@ public class RootInfo {
public int rootType;
public int flags;
public int icon;
+ public int localIcon;
public String title;
public String summary;
public String documentId;
@@ -59,11 +61,30 @@ public class RootInfo {
final String raw = getCursorString(cursor, Root.COLUMN_MIME_TYPES);
root.mimeTypes = (raw != null) ? raw.split("\n") : null;
+ // TODO: remove these special case icons
+ if ("com.android.externalstorage.documents".equals(authority)) {
+ root.localIcon = R.drawable.ic_root_sdcard;
+ }
+ if ("com.android.providers.downloads.documents".equals(authority)) {
+ root.localIcon = R.drawable.ic_root_download;
+ }
+ if ("com.android.providers.media.documents".equals(authority)) {
+ if ("image".equals(root.rootId)) {
+ root.localIcon = R.drawable.ic_doc_image;
+ } else if ("audio".equals(root.rootId)) {
+ root.localIcon = R.drawable.ic_doc_audio;
+ }
+ }
+
return root;
}
public Drawable loadIcon(Context context) {
- return IconUtils.loadPackageIcon(context, authority, icon);
+ if (localIcon != 0) {
+ return context.getResources().getDrawable(localIcon);
+ } else {
+ return IconUtils.loadPackageIcon(context, authority, icon);
+ }
}
@Override
diff --git a/packages/DocumentsUI/tests/Android.mk b/packages/DocumentsUI/tests/Android.mk
new file mode 100644
index 0000000000000..fdf4fabacce02
--- /dev/null
+++ b/packages/DocumentsUI/tests/Android.mk
@@ -0,0 +1,16 @@
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+LOCAL_PACKAGE_NAME := DocumentsUITests
+LOCAL_INSTRUMENTATION_FOR := DocumentsUI
+
+LOCAL_CERTIFICATE := platform
+
+include $(BUILD_PACKAGE)
diff --git a/packages/DocumentsUI/tests/AndroidManifest.xml b/packages/DocumentsUI/tests/AndroidManifest.xml
new file mode 100644
index 0000000000000..81a2889a8ee92
--- /dev/null
+++ b/packages/DocumentsUI/tests/AndroidManifest.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/RootsCacheTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/RootsCacheTest.java
new file mode 100644
index 0000000000000..f53e60dcfcafc
--- /dev/null
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/RootsCacheTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.documentsui;
+
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import com.android.documentsui.DocumentsActivity.State;
+import com.android.documentsui.model.RootInfo;
+import com.google.android.collect.Lists;
+
+import java.util.List;
+
+@SmallTest
+public class RootsCacheTest extends AndroidTestCase {
+
+ private static RootInfo buildForMimeTypes(String... mimeTypes) {
+ final RootInfo root = new RootInfo();
+ root.mimeTypes = mimeTypes;
+ return root;
+ }
+
+ private RootInfo mNull = new RootInfo();
+ private RootInfo mEmpty = buildForMimeTypes();
+ private RootInfo mWild = buildForMimeTypes("*/*");
+ private RootInfo mImages = buildForMimeTypes("image/*");
+ private RootInfo mAudio = buildForMimeTypes("audio/*", "application/ogg", "application/x-flac");
+ private RootInfo mDocs = buildForMimeTypes("application/msword", "application/vnd.ms-excel");
+ private RootInfo mMalformed1 = buildForMimeTypes("meow");
+ private RootInfo mMalformed2 = buildForMimeTypes("*/meow");
+
+ private List mRoots = Lists.newArrayList(
+ mNull, mWild, mEmpty, mImages, mAudio, mDocs, mMalformed1, mMalformed2);
+
+ private State mState;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ mState = new State();
+ mState.action = State.ACTION_OPEN;
+ mState.showAdvanced = true;
+ mState.localOnly = false;
+ }
+
+ public void testMatchingRootsEverything() throws Exception {
+ mState.acceptMimes = new String[] { "*/*" };
+ assertContainsExactly(
+ Lists.newArrayList(mNull, mWild, mImages, mAudio, mDocs, mMalformed1, mMalformed2),
+ RootsCache.getMatchingRoots(mRoots, mState));
+ }
+
+ public void testMatchingRootsPngOrWild() throws Exception {
+ mState.acceptMimes = new String[] { "image/png", "*/*" };
+ assertContainsExactly(
+ Lists.newArrayList(mNull, mWild, mImages, mAudio, mDocs, mMalformed1, mMalformed2),
+ RootsCache.getMatchingRoots(mRoots, mState));
+ }
+
+ public void testMatchingRootsAudioWild() throws Exception {
+ mState.acceptMimes = new String[] { "audio/*" };
+ assertContainsExactly(
+ Lists.newArrayList(mNull, mWild, mAudio),
+ RootsCache.getMatchingRoots(mRoots, mState));
+ }
+
+ public void testMatchingRootsAudioWildOrImageWild() throws Exception {
+ mState.acceptMimes = new String[] { "audio/*", "image/*" };
+ assertContainsExactly(
+ Lists.newArrayList(mNull, mWild, mAudio, mImages),
+ RootsCache.getMatchingRoots(mRoots, mState));
+ }
+
+ public void testMatchingRootsAudioSpecific() throws Exception {
+ mState.acceptMimes = new String[] { "audio/mpeg" };
+ assertContainsExactly(
+ Lists.newArrayList(mNull, mWild, mAudio),
+ RootsCache.getMatchingRoots(mRoots, mState));
+ }
+
+ public void testMatchingRootsDocument() throws Exception {
+ mState.acceptMimes = new String[] { "application/msword" };
+ assertContainsExactly(
+ Lists.newArrayList(mNull, mWild, mDocs),
+ RootsCache.getMatchingRoots(mRoots, mState));
+ }
+
+ public void testMatchingRootsApplication() throws Exception {
+ mState.acceptMimes = new String[] { "application/*" };
+ assertContainsExactly(
+ Lists.newArrayList(mNull, mWild, mAudio, mDocs),
+ RootsCache.getMatchingRoots(mRoots, mState));
+ }
+
+ public void testMatchingRootsFlacOrPng() throws Exception {
+ mState.acceptMimes = new String[] { "application/x-flac", "image/png" };
+ assertContainsExactly(
+ Lists.newArrayList(mNull, mWild, mAudio, mImages),
+ RootsCache.getMatchingRoots(mRoots, mState));
+ }
+
+ private static void assertContainsExactly(List> expected, List> actual) {
+ assertEquals(expected.size(), actual.size());
+ for (Object o : expected) {
+ assertTrue(actual.contains(o));
+ }
+ }
+}
diff --git a/packages/ExternalStorageProvider/res/drawable-hdpi/ic_pdf.png b/packages/ExternalStorageProvider/res/drawable-hdpi/ic_pdf.png
deleted file mode 100644
index 961a9bbfcfcfd..0000000000000
Binary files a/packages/ExternalStorageProvider/res/drawable-hdpi/ic_pdf.png and /dev/null differ
diff --git a/packages/ExternalStorageProvider/res/xml/document_provider.xml b/packages/ExternalStorageProvider/res/xml/document_provider.xml
deleted file mode 100644
index 929a2734a0f2d..0000000000000
--- a/packages/ExternalStorageProvider/res/xml/document_provider.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index bbe3b455f54cb..226d6351e96fd 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -88,7 +88,6 @@ public class ExternalStorageProvider extends DocumentsProvider {
root.rootId = "primary";
root.rootType = Root.ROOT_TYPE_DEVICE;
root.flags = Root.FLAG_SUPPORTS_CREATE | Root.FLAG_LOCAL_ONLY | Root.FLAG_ADVANCED;
- root.icon = R.drawable.ic_pdf;
root.title = getContext().getString(R.string.root_internal_storage);
root.docId = getDocIdForFile(path);
mRoots.add(root);