From 36936a1439a2400d16c2ace536ae319f11cb9312 Mon Sep 17 00:00:00 2001
From: Luciano Pacheco <lucmult@google.com>
Date: Thu, 14 Nov 2024 17:48:18 +1100
Subject: DocumentsUI: Move the styles, layout and theme for flag M3 disabled

This is a preparation to allow customizing the Material3 behind a flag
without changing the current layout and styles.

Test: Manual build, deploy apk and start it on DUT with flag on/off
Flag: com.android.documentsui.flags.use_material3
Bug: 377771271
Change-Id: Ifdea578323a613456ffcc2e146adaf6892d91ff2
---
 res/color/doc_list_item_subtitle_color.xml         |  22 ---
 .../fragment_pick_button_background_color.xml      |  20 --
 res/color/fragment_pick_button_text_color.xml      |  20 --
 res/color/horizontal_breadcrumb_color.xml          |  21 ---
 res/color/item_action_icon.xml                     |  22 ---
 res/color/item_details.xml                         |  21 ---
 res/color/item_doc_grid_border.xml                 |  27 ---
 res/color/item_doc_grid_tint.xml                   |  24 ---
 res/color/item_root_icon.xml                       |  24 ---
 res/color/item_root_primary_text.xml               |  22 ---
 res/color/item_root_secondary_text.xml             |  25 ---
 res/color/profile_tab_selector.xml                 |  23 ---
 res/color/search_chip_background_color.xml         |  22 ---
 res/color/search_chip_ripple_color.xml             |  38 ----
 res/color/search_chip_stroke_color.xml             |  23 ---
 res/color/search_chip_text_color.xml               |  22 ---
 res/color/sort_list_text.xml                       |  22 ---
 .../color/doc_list_item_subtitle_color.xml         |  22 +++
 .../fragment_pick_button_background_color.xml      |  20 ++
 .../color/fragment_pick_button_text_color.xml      |  20 ++
 .../color/horizontal_breadcrumb_color.xml          |  21 +++
 .../color/item_action_icon.xml                     |  22 +++
 .../color/item_details.xml                         |  21 +++
 .../color/item_doc_grid_border.xml                 |  27 +++
 .../color/item_doc_grid_tint.xml                   |  24 +++
 .../color/item_root_icon.xml                       |  24 +++
 .../color/item_root_primary_text.xml               |  22 +++
 .../color/item_root_secondary_text.xml             |  25 +++
 .../color/profile_tab_selector.xml                 |  23 +++
 .../color/search_chip_background_color.xml         |  22 +++
 .../color/search_chip_ripple_color.xml             |  38 ++++
 .../color/search_chip_stroke_color.xml             |  23 +++
 .../color/search_chip_text_color.xml               |  22 +++
 .../color/sort_list_text.xml                       |  22 +++
 .../layout-sw720dp/column_headers.xml              | 122 ++++++++++++
 .../layout-sw720dp/directory_app_bar.xml           |  55 ++++++
 .../layout-sw720dp/item_doc_list.xml               | 186 ++++++++++++++++++
 .../layout-sw720dp/shared_cell_content.xml         |  37 ++++
 .../layout/apps_item.xml                           |  59 ++++++
 .../layout/apps_row.xml                            |  46 +++++
 .../layout/column_headers.xml                      |  20 ++
 .../layout/dialog_delete_confirmation.xml          |  25 +++
 .../layout/dialog_file_name.xml                    |  42 +++++
 .../layout/dialog_sorting.xml                      |  38 ++++
 .../layout/directory_app_bar.xml                   |  66 +++++++
 .../layout/directory_header.xml                    |  96 ++++++++++
 .../layout/drag_shadow_layout.xml                  |  48 +++++
 .../layout/drawer_layout.xml                       | 102 ++++++++++
 .../layout/drop_badge.xml                          |  24 +++
 .../layout/fixed_layout.xml                        | 111 +++++++++++
 .../layout/fragment_directory.xml                  |  56 ++++++
 .../layout/fragment_pick.xml                       |  60 ++++++
 .../layout/fragment_roots.xml                      |  23 +++
 .../layout/fragment_save.xml                       |  76 ++++++++
 .../layout/fragment_search.xml                     |  34 ++++
 .../layout/inspector_action_view.xml               |  58 ++++++
 .../layout/inspector_activity.xml                  | 119 ++++++++++++
 .../layout/inspector_header.xml                    |  29 +++
 .../layout/inspector_section_title.xml             |  45 +++++
 .../layout/item_dir_grid.xml                       | 116 ++++++++++++
 .../layout/item_doc_grid.xml                       | 209 +++++++++++++++++++++
 .../layout/item_doc_header_message.xml             | 116 ++++++++++++
 .../layout/item_doc_inflated_message.xml           |  28 +++
 .../layout/item_doc_inflated_message_content.xml   |  45 +++++
 .../item_doc_inflated_message_cross_profile.xml    |  73 +++++++
 .../layout/item_doc_list.xml                       | 163 ++++++++++++++++
 .../layout/item_history.xml                        |  50 +++++
 .../layout/item_photo_grid.xml                     | 141 ++++++++++++++
 .../layout/item_root.xml                           |  92 +++++++++
 .../layout/item_root_header.xml                    |  33 ++++
 .../layout/item_root_spacer.xml                    |  29 +++
 .../layout/navigation_breadcrumb_item.xml          |  54 ++++++
 .../layout/root_vertical_divider.xml               |  34 ++++
 .../layout/search_chip_item.xml                    |  35 ++++
 .../layout/search_chip_row.xml                     |  34 ++++
 .../layout/sort_list_item.xml                      |  25 +++
 .../layout/table_key_value_row.xml                 |  50 +++++
 .../values-h600dp-v31/dimens.xml                   |  19 ++
 .../values-h600dp/dimens.xml                       |  19 ++
 .../values-night-v31/colors.xml                    |  50 +++++
 .../values-night-v31/styles.xml                    |  37 ++++
 .../values-night/colors.xml                        |  40 ++++
 .../values-night/themes.xml                        |  47 +++++
 .../values-sw600dp/dimens.xml                      |  19 ++
 .../values-sw720dp/colors.xml                      |  19 ++
 .../values-sw720dp/dimens.xml                      |  31 +++
 .../values-v31/colors.xml                          |  51 +++++
 .../values-v31/dimens.xml                          |  29 +++
 .../values-v31/styles.xml                          |  60 ++++++
 .../values-v31/styles_text.xml                     |  28 +++
 .../values/colors.xml                              |  72 +++++++
 .../values/dimens.xml                              | 135 +++++++++++++
 .../values/layouts.xml                             |  20 ++
 .../values/styles.xml                              | 122 ++++++++++++
 .../values/styles_text.xml                         | 153 +++++++++++++++
 .../values/themes.xml                              | 113 +++++++++++
 res/layout-sw720dp/column_headers.xml              | 122 ------------
 res/layout-sw720dp/directory_app_bar.xml           |  55 ------
 res/layout-sw720dp/item_doc_list.xml               | 186 ------------------
 res/layout-sw720dp/shared_cell_content.xml         |  37 ----
 res/layout/apps_item.xml                           |  59 ------
 res/layout/apps_row.xml                            |  46 -----
 res/layout/column_headers.xml                      |  20 --
 res/layout/dialog_delete_confirmation.xml          |  25 ---
 res/layout/dialog_file_name.xml                    |  42 -----
 res/layout/dialog_sorting.xml                      |  38 ----
 res/layout/directory_app_bar.xml                   |  66 -------
 res/layout/directory_header.xml                    |  96 ----------
 res/layout/drag_shadow_layout.xml                  |  48 -----
 res/layout/drawer_layout.xml                       | 102 ----------
 res/layout/drop_badge.xml                          |  24 ---
 res/layout/fixed_layout.xml                        | 111 -----------
 res/layout/fragment_directory.xml                  |  56 ------
 res/layout/fragment_pick.xml                       |  60 ------
 res/layout/fragment_roots.xml                      |  23 ---
 res/layout/fragment_save.xml                       |  76 --------
 res/layout/fragment_search.xml                     |  34 ----
 res/layout/inspector_action_view.xml               |  58 ------
 res/layout/inspector_activity.xml                  | 119 ------------
 res/layout/inspector_header.xml                    |  29 ---
 res/layout/inspector_section_title.xml             |  45 -----
 res/layout/item_dir_grid.xml                       | 116 ------------
 res/layout/item_doc_grid.xml                       | 209 ---------------------
 res/layout/item_doc_header_message.xml             | 116 ------------
 res/layout/item_doc_inflated_message.xml           |  28 ---
 res/layout/item_doc_inflated_message_content.xml   |  45 -----
 .../item_doc_inflated_message_cross_profile.xml    |  73 -------
 res/layout/item_doc_list.xml                       | 163 ----------------
 res/layout/item_history.xml                        |  50 -----
 res/layout/item_photo_grid.xml                     | 141 --------------
 res/layout/item_root.xml                           |  92 ---------
 res/layout/item_root_header.xml                    |  33 ----
 res/layout/item_root_spacer.xml                    |  29 ---
 res/layout/navigation_breadcrumb_item.xml          |  54 ------
 res/layout/root_vertical_divider.xml               |  34 ----
 res/layout/search_chip_item.xml                    |  35 ----
 res/layout/search_chip_row.xml                     |  34 ----
 res/layout/sort_list_item.xml                      |  25 ---
 res/layout/table_key_value_row.xml                 |  50 -----
 res/values-h600dp-v31/dimens.xml                   |  19 --
 res/values-h600dp/dimens.xml                       |  19 --
 res/values-night-v31/colors.xml                    |  50 -----
 res/values-night-v31/styles.xml                    |  37 ----
 res/values-night/colors.xml                        |  40 ----
 res/values-night/themes.xml                        |  47 -----
 res/values-sw600dp/dimens.xml                      |  19 --
 res/values-sw720dp/colors.xml                      |  19 --
 res/values-sw720dp/dimens.xml                      |  31 ---
 res/values-v31/colors.xml                          |  51 -----
 res/values-v31/dimens.xml                          |  29 ---
 res/values-v31/styles.xml                          |  60 ------
 res/values-v31/styles_text.xml                     |  28 ---
 res/values/colors.xml                              |  72 -------
 res/values/dimens.xml                              | 135 -------------
 res/values/layouts.xml                             |  20 --
 res/values/styles.xml                              | 122 ------------
 res/values/styles_text.xml                         | 153 ---------------
 res/values/themes.xml                              | 113 -----------
 158 files changed, 4366 insertions(+), 4366 deletions(-)
 delete mode 100644 res/color/doc_list_item_subtitle_color.xml
 delete mode 100644 res/color/fragment_pick_button_background_color.xml
 delete mode 100644 res/color/fragment_pick_button_text_color.xml
 delete mode 100644 res/color/horizontal_breadcrumb_color.xml
 delete mode 100644 res/color/item_action_icon.xml
 delete mode 100644 res/color/item_details.xml
 delete mode 100644 res/color/item_doc_grid_border.xml
 delete mode 100644 res/color/item_doc_grid_tint.xml
 delete mode 100644 res/color/item_root_icon.xml
 delete mode 100644 res/color/item_root_primary_text.xml
 delete mode 100644 res/color/item_root_secondary_text.xml
 delete mode 100644 res/color/profile_tab_selector.xml
 delete mode 100644 res/color/search_chip_background_color.xml
 delete mode 100644 res/color/search_chip_ripple_color.xml
 delete mode 100644 res/color/search_chip_stroke_color.xml
 delete mode 100644 res/color/search_chip_text_color.xml
 delete mode 100644 res/color/sort_list_text.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/doc_list_item_subtitle_color.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/fragment_pick_button_background_color.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/fragment_pick_button_text_color.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/horizontal_breadcrumb_color.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/item_action_icon.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/item_details.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/item_doc_grid_border.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/item_doc_grid_tint.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_icon.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_primary_text.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_secondary_text.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/profile_tab_selector.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_background_color.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_ripple_color.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_stroke_color.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_text_color.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/color/sort_list_text.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/column_headers.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/directory_app_bar.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/item_doc_list.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/shared_cell_content.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/apps_item.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/apps_row.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/column_headers.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_delete_confirmation.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_file_name.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_sorting.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/directory_app_bar.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/directory_header.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/drag_shadow_layout.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/drawer_layout.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/drop_badge.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/fixed_layout.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_directory.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_roots.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_save.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_search.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_action_view.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_activity.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_header.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_section_title.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_dir_grid.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_grid.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_header_message.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message_content.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message_cross_profile.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_list.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_history.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_photo_grid.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root_header.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root_spacer.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/navigation_breadcrumb_item.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/root_vertical_divider.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/search_chip_item.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/search_chip_row.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/sort_list_item.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/layout/table_key_value_row.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-h600dp-v31/dimens.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-h600dp/dimens.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-night-v31/colors.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-night-v31/styles.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-night/colors.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-night/themes.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-sw600dp/dimens.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-sw720dp/colors.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-sw720dp/dimens.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-v31/colors.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-v31/dimens.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles_text.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values/colors.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values/dimens.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values/layouts.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values/styles.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values/styles_text.xml
 create mode 100644 res/flag(!com.android.documentsui.flags.use_material3)/values/themes.xml
 delete mode 100644 res/layout-sw720dp/column_headers.xml
 delete mode 100644 res/layout-sw720dp/directory_app_bar.xml
 delete mode 100644 res/layout-sw720dp/item_doc_list.xml
 delete mode 100644 res/layout-sw720dp/shared_cell_content.xml
 delete mode 100644 res/layout/apps_item.xml
 delete mode 100644 res/layout/apps_row.xml
 delete mode 100644 res/layout/column_headers.xml
 delete mode 100644 res/layout/dialog_delete_confirmation.xml
 delete mode 100644 res/layout/dialog_file_name.xml
 delete mode 100644 res/layout/dialog_sorting.xml
 delete mode 100644 res/layout/directory_app_bar.xml
 delete mode 100644 res/layout/directory_header.xml
 delete mode 100644 res/layout/drag_shadow_layout.xml
 delete mode 100644 res/layout/drawer_layout.xml
 delete mode 100644 res/layout/drop_badge.xml
 delete mode 100644 res/layout/fixed_layout.xml
 delete mode 100644 res/layout/fragment_directory.xml
 delete mode 100644 res/layout/fragment_pick.xml
 delete mode 100644 res/layout/fragment_roots.xml
 delete mode 100644 res/layout/fragment_save.xml
 delete mode 100644 res/layout/fragment_search.xml
 delete mode 100644 res/layout/inspector_action_view.xml
 delete mode 100644 res/layout/inspector_activity.xml
 delete mode 100644 res/layout/inspector_header.xml
 delete mode 100644 res/layout/inspector_section_title.xml
 delete mode 100644 res/layout/item_dir_grid.xml
 delete mode 100644 res/layout/item_doc_grid.xml
 delete mode 100644 res/layout/item_doc_header_message.xml
 delete mode 100644 res/layout/item_doc_inflated_message.xml
 delete mode 100644 res/layout/item_doc_inflated_message_content.xml
 delete mode 100644 res/layout/item_doc_inflated_message_cross_profile.xml
 delete mode 100644 res/layout/item_doc_list.xml
 delete mode 100644 res/layout/item_history.xml
 delete mode 100644 res/layout/item_photo_grid.xml
 delete mode 100644 res/layout/item_root.xml
 delete mode 100644 res/layout/item_root_header.xml
 delete mode 100644 res/layout/item_root_spacer.xml
 delete mode 100644 res/layout/navigation_breadcrumb_item.xml
 delete mode 100644 res/layout/root_vertical_divider.xml
 delete mode 100644 res/layout/search_chip_item.xml
 delete mode 100644 res/layout/search_chip_row.xml
 delete mode 100644 res/layout/sort_list_item.xml
 delete mode 100644 res/layout/table_key_value_row.xml
 delete mode 100644 res/values-h600dp-v31/dimens.xml
 delete mode 100644 res/values-h600dp/dimens.xml
 delete mode 100644 res/values-night-v31/colors.xml
 delete mode 100644 res/values-night-v31/styles.xml
 delete mode 100644 res/values-night/colors.xml
 delete mode 100644 res/values-night/themes.xml
 delete mode 100644 res/values-sw600dp/dimens.xml
 delete mode 100644 res/values-sw720dp/colors.xml
 delete mode 100644 res/values-sw720dp/dimens.xml
 delete mode 100644 res/values-v31/colors.xml
 delete mode 100644 res/values-v31/dimens.xml
 delete mode 100644 res/values-v31/styles.xml
 delete mode 100644 res/values-v31/styles_text.xml
 delete mode 100644 res/values/colors.xml
 delete mode 100644 res/values/dimens.xml
 delete mode 100644 res/values/layouts.xml
 delete mode 100644 res/values/styles.xml
 delete mode 100644 res/values/styles_text.xml
 delete mode 100644 res/values/themes.xml

diff --git a/res/color/doc_list_item_subtitle_color.xml b/res/color/doc_list_item_subtitle_color.xml
deleted file mode 100644
index 5f5896e7a..000000000
--- a/res/color/doc_list_item_subtitle_color.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2020 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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:color="@color/doc_list_item_subtitle_disabled" />
-    <item android:color="@color/doc_list_item_subtitle_enabled" />
-</selector>
diff --git a/res/color/fragment_pick_button_background_color.xml b/res/color/fragment_pick_button_background_color.xml
deleted file mode 100644
index cf6d480ea..000000000
--- a/res/color/fragment_pick_button_background_color.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Copyright 2018 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
-
-      https://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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/fragment_pick_active_button_color" android:state_enabled="true" />
-  <item android:color="@color/fragment_pick_inactive_button_color" android:state_enabled="false" />
-</selector>
\ No newline at end of file
diff --git a/res/color/fragment_pick_button_text_color.xml b/res/color/fragment_pick_button_text_color.xml
deleted file mode 100644
index e4e1edc48..000000000
--- a/res/color/fragment_pick_button_text_color.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Copyright 2018 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
-
-      https://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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/fragment_pick_active_text_color" android:state_enabled="true" />
-  <item android:color="@color/fragment_pick_inactive_text_color" android:state_enabled="false" />
-</selector>
\ No newline at end of file
diff --git a/res/color/horizontal_breadcrumb_color.xml b/res/color/horizontal_breadcrumb_color.xml
deleted file mode 100644
index d5a852c0a..000000000
--- a/res/color/horizontal_breadcrumb_color.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true"
-        android:color="?android:colorAccent" />
-    <item android:color="?android:attr/colorControlNormal" />
-</selector>
diff --git a/res/color/item_action_icon.xml b/res/color/item_action_icon.xml
deleted file mode 100644
index 5de0cb678..000000000
--- a/res/color/item_action_icon.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:alpha="@dimen/root_icon_disabled_alpha"
-        android:color="?android:colorControlNormal" />
-    <item android:color="?android:colorControlNormal" />
-</selector>
diff --git a/res/color/item_details.xml b/res/color/item_details.xml
deleted file mode 100644
index 970e55d76..000000000
--- a/res/color/item_details.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_enabled="true"
-        android:color="?android:textColorSecondary" />
-</selector>
diff --git a/res/color/item_doc_grid_border.xml b/res/color/item_doc_grid_border.xml
deleted file mode 100644
index 592d07634..000000000
--- a/res/color/item_doc_grid_border.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:state_selected="false"
-        android:color="?android:attr/colorAccent"/>
-    <item
-        android:state_selected="true"
-        android:color="?android:attr/colorAccent"/>
-    <item
-        android:color="@android:color/transparent"/>
-</selector>
diff --git a/res/color/item_doc_grid_tint.xml b/res/color/item_doc_grid_tint.xml
deleted file mode 100644
index 878afb175..000000000
--- a/res/color/item_doc_grid_tint.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_activated="true"
-        android:color="?android:colorAccent"
-        android:alpha=".15" />
-    <item
-        android:color="@android:color/transparent" />
-</selector>
diff --git a/res/color/item_root_icon.xml b/res/color/item_root_icon.xml
deleted file mode 100644
index 456d1b4a2..000000000
--- a/res/color/item_root_icon.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_activated="false"
-        android:color="?android:colorControlNormal" />
-    <item
-        android:state_activated="true"
-        android:color="?android:colorControlActivated" />
-</selector>
diff --git a/res/color/item_root_primary_text.xml b/res/color/item_root_primary_text.xml
deleted file mode 100644
index 62a620c85..000000000
--- a/res/color/item_root_primary_text.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:state_activated="true" android:color="?android:colorControlActivated" />
-    <item android:state_focused="false" android:state_activated="true" android:color="?android:colorControlActivated" />
-    <item android:state_enabled="false" android:alpha="0.5" android:color="?android:textColorPrimary" />
-    <item android:color="?android:textColorPrimary" />
-</selector>
diff --git a/res/color/item_root_secondary_text.xml b/res/color/item_root_secondary_text.xml
deleted file mode 100644
index 632135ce8..000000000
--- a/res/color/item_root_secondary_text.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 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
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:state_activated="true"
-        android:color="?android:colorControlActivated" />
-    <item android:state_focused="false" android:state_activated="true"
-        android:color="?android:colorControlActivated" />
-    <item android:state_enabled="false" android:alpha="0.5" android:color="?android:textColorSecondary" />
-    <item android:color="?android:textColorSecondary" />
-</selector>
diff --git a/res/color/profile_tab_selector.xml b/res/color/profile_tab_selector.xml
deleted file mode 100644
index 53aef1f6a..000000000
--- a/res/color/profile_tab_selector.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_selected="true"
-        android:color="@color/profile_tab_selected_color"/>
-    <item
-        android:color="@color/profile_tab_default_color"/>
-</selector>
diff --git a/res/color/search_chip_background_color.xml b/res/color/search_chip_background_color.xml
deleted file mode 100644
index c94d155a5..000000000
--- a/res/color/search_chip_background_color.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2018 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
-
-      https://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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="?android:attr/colorSecondary"/>
-    <item android:state_enabled="true" android:color="?android:attr/colorBackground"/>
-    <item android:state_enabled="false" android:color="@color/chip_background_disable_color"/>
-</selector>
\ No newline at end of file
diff --git a/res/color/search_chip_ripple_color.xml b/res/color/search_chip_ripple_color.xml
deleted file mode 100644
index 0f78a0722..000000000
--- a/res/color/search_chip_ripple_color.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2018 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
-
-      https://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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Selected. -->
-    <item android:state_pressed="true" android:state_selected="true"
-          android:alpha="0.16" android:color="?android:colorSecondary"/>
-    <item android:state_focused="true" android:state_hovered="true" android:state_selected="true"
-          android:alpha="0.16" android:color="?android:colorSecondary"/>
-    <item android:state_focused="true" android:state_selected="true"
-          android:alpha="0.12" android:color="?android:colorSecondary"/>
-    <item android:state_hovered="true" android:state_selected="true"
-          android:alpha="0.04" android:color="?android:colorSecondary"/>
-    <item android:state_selected="true"
-          android:alpha="0.00" android:color="?android:colorSecondary"/>
-
-    <!-- Unselected. -->
-    <item android:state_pressed="true" android:alpha="0.16" android:color="?android:textColorSecondary"/>
-    <item android:state_focused="true" android:state_hovered="true"
-          android:alpha="0.16" android:color="?android:textColorSecondary"/>
-    <item android:state_focused="true" android:alpha="0.12" android:color="?android:textColorSecondary"/>
-    <item android:state_hovered="true" android:alpha="0.04" android:color="?android:textColorSecondary"/>
-    <item android:alpha="0.00" android:color="?android:textColorSecondary"/>
-</selector>
\ No newline at end of file
diff --git a/res/color/search_chip_stroke_color.xml b/res/color/search_chip_stroke_color.xml
deleted file mode 100644
index be169354e..000000000
--- a/res/color/search_chip_stroke_color.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2018 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
-
-      https://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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="@android:color/transparent"/>
-    <item android:state_pressed="true" android:color="@android:color/transparent"/>
-    <item android:state_enabled="true" android:color="?android:strokeColor"/>
-    <item android:state_enabled="false" android:color="@android:color/transparent"/>
-</selector>
\ No newline at end of file
diff --git a/res/color/search_chip_text_color.xml b/res/color/search_chip_text_color.xml
deleted file mode 100644
index 4e6e3a9d7..000000000
--- a/res/color/search_chip_text_color.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2018 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
-
-      https://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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="@color/search_chip_text_selected_color"/>
-    <item android:state_enabled="true" android:color="?android:textColorSecondary"/>
-    <item android:state_enabled="false" android:color="?android:textColorSecondary" android:alpha="0.3"/>
-</selector>
\ No newline at end of file
diff --git a/res/color/sort_list_text.xml b/res/color/sort_list_text.xml
deleted file mode 100644
index cbe8da6fe..000000000
--- a/res/color/sort_list_text.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_checked="true"
-        android:color="?android:attr/colorAccent"/>
-    <item
-        android:color="?android:attr/textColorPrimary"/>
-</selector>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/doc_list_item_subtitle_color.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/doc_list_item_subtitle_color.xml
new file mode 100644
index 000000000..5f5896e7a
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/doc_list_item_subtitle_color.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+        android:color="@color/doc_list_item_subtitle_disabled" />
+    <item android:color="@color/doc_list_item_subtitle_enabled" />
+</selector>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/fragment_pick_button_background_color.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/fragment_pick_button_background_color.xml
new file mode 100644
index 000000000..cf6d480ea
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/fragment_pick_button_background_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2018 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
+
+      https://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.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@color/fragment_pick_active_button_color" android:state_enabled="true" />
+  <item android:color="@color/fragment_pick_inactive_button_color" android:state_enabled="false" />
+</selector>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/fragment_pick_button_text_color.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/fragment_pick_button_text_color.xml
new file mode 100644
index 000000000..e4e1edc48
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/fragment_pick_button_text_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2018 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
+
+      https://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.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@color/fragment_pick_active_text_color" android:state_enabled="true" />
+  <item android:color="@color/fragment_pick_inactive_text_color" android:state_enabled="false" />
+</selector>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/horizontal_breadcrumb_color.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/horizontal_breadcrumb_color.xml
new file mode 100644
index 000000000..d5a852c0a
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/horizontal_breadcrumb_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true"
+        android:color="?android:colorAccent" />
+    <item android:color="?android:attr/colorControlNormal" />
+</selector>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/item_action_icon.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_action_icon.xml
new file mode 100644
index 000000000..5de0cb678
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_action_icon.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+        android:alpha="@dimen/root_icon_disabled_alpha"
+        android:color="?android:colorControlNormal" />
+    <item android:color="?android:colorControlNormal" />
+</selector>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/item_details.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_details.xml
new file mode 100644
index 000000000..970e55d76
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_details.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_enabled="true"
+        android:color="?android:textColorSecondary" />
+</selector>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/item_doc_grid_border.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_doc_grid_border.xml
new file mode 100644
index 000000000..592d07634
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_doc_grid_border.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:state_selected="false"
+        android:color="?android:attr/colorAccent"/>
+    <item
+        android:state_selected="true"
+        android:color="?android:attr/colorAccent"/>
+    <item
+        android:color="@android:color/transparent"/>
+</selector>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/item_doc_grid_tint.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_doc_grid_tint.xml
new file mode 100644
index 000000000..878afb175
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_doc_grid_tint.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_activated="true"
+        android:color="?android:colorAccent"
+        android:alpha=".15" />
+    <item
+        android:color="@android:color/transparent" />
+</selector>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_icon.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_icon.xml
new file mode 100644
index 000000000..456d1b4a2
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_icon.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_activated="false"
+        android:color="?android:colorControlNormal" />
+    <item
+        android:state_activated="true"
+        android:color="?android:colorControlActivated" />
+</selector>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_primary_text.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_primary_text.xml
new file mode 100644
index 000000000..62a620c85
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_primary_text.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_activated="true" android:color="?android:colorControlActivated" />
+    <item android:state_focused="false" android:state_activated="true" android:color="?android:colorControlActivated" />
+    <item android:state_enabled="false" android:alpha="0.5" android:color="?android:textColorPrimary" />
+    <item android:color="?android:textColorPrimary" />
+</selector>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_secondary_text.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_secondary_text.xml
new file mode 100644
index 000000000..632135ce8
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/item_root_secondary_text.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 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
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_activated="true"
+        android:color="?android:colorControlActivated" />
+    <item android:state_focused="false" android:state_activated="true"
+        android:color="?android:colorControlActivated" />
+    <item android:state_enabled="false" android:alpha="0.5" android:color="?android:textColorSecondary" />
+    <item android:color="?android:textColorSecondary" />
+</selector>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/profile_tab_selector.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/profile_tab_selector.xml
new file mode 100644
index 000000000..53aef1f6a
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/profile_tab_selector.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_selected="true"
+        android:color="@color/profile_tab_selected_color"/>
+    <item
+        android:color="@color/profile_tab_default_color"/>
+</selector>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_background_color.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_background_color.xml
new file mode 100644
index 000000000..c94d155a5
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_background_color.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2018 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
+
+      https://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.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:color="?android:attr/colorSecondary"/>
+    <item android:state_enabled="true" android:color="?android:attr/colorBackground"/>
+    <item android:state_enabled="false" android:color="@color/chip_background_disable_color"/>
+</selector>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_ripple_color.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_ripple_color.xml
new file mode 100644
index 000000000..0f78a0722
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_ripple_color.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2018 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
+
+      https://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.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Selected. -->
+    <item android:state_pressed="true" android:state_selected="true"
+          android:alpha="0.16" android:color="?android:colorSecondary"/>
+    <item android:state_focused="true" android:state_hovered="true" android:state_selected="true"
+          android:alpha="0.16" android:color="?android:colorSecondary"/>
+    <item android:state_focused="true" android:state_selected="true"
+          android:alpha="0.12" android:color="?android:colorSecondary"/>
+    <item android:state_hovered="true" android:state_selected="true"
+          android:alpha="0.04" android:color="?android:colorSecondary"/>
+    <item android:state_selected="true"
+          android:alpha="0.00" android:color="?android:colorSecondary"/>
+
+    <!-- Unselected. -->
+    <item android:state_pressed="true" android:alpha="0.16" android:color="?android:textColorSecondary"/>
+    <item android:state_focused="true" android:state_hovered="true"
+          android:alpha="0.16" android:color="?android:textColorSecondary"/>
+    <item android:state_focused="true" android:alpha="0.12" android:color="?android:textColorSecondary"/>
+    <item android:state_hovered="true" android:alpha="0.04" android:color="?android:textColorSecondary"/>
+    <item android:alpha="0.00" android:color="?android:textColorSecondary"/>
+</selector>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_stroke_color.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_stroke_color.xml
new file mode 100644
index 000000000..be169354e
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_stroke_color.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2018 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
+
+      https://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.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:color="@android:color/transparent"/>
+    <item android:state_pressed="true" android:color="@android:color/transparent"/>
+    <item android:state_enabled="true" android:color="?android:strokeColor"/>
+    <item android:state_enabled="false" android:color="@android:color/transparent"/>
+</selector>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_text_color.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_text_color.xml
new file mode 100644
index 000000000..4e6e3a9d7
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/search_chip_text_color.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2018 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
+
+      https://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.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:color="@color/search_chip_text_selected_color"/>
+    <item android:state_enabled="true" android:color="?android:textColorSecondary"/>
+    <item android:state_enabled="false" android:color="?android:textColorSecondary" android:alpha="0.3"/>
+</selector>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/color/sort_list_text.xml b/res/flag(!com.android.documentsui.flags.use_material3)/color/sort_list_text.xml
new file mode 100644
index 000000000..cbe8da6fe
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/color/sort_list_text.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_checked="true"
+        android:color="?android:attr/colorAccent"/>
+    <item
+        android:color="?android:attr/textColorPrimary"/>
+</selector>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/column_headers.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/column_headers.xml
new file mode 100644
index 000000000..60be5dc10
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/column_headers.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/table_header"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/doc_header_height"
+    android:background="@drawable/sort_widget_background"
+    android:visibility="gone">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:baselineAligned="false"
+        android:gravity="center_vertical"
+        android:minHeight="@dimen/list_item_height"
+        android:paddingStart="@dimen/list_item_padding"
+        android:paddingEnd="@dimen/list_item_width"
+        android:orientation="horizontal">
+        <!-- Placeholder for icon -->
+        <View
+            android:layout_width="@dimen/list_item_thumbnail_size"
+            android:layout_height="@dimen/list_item_thumbnail_size"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="16dp"
+            android:layout_marginStart="0dp"/>
+
+        <!-- Column headers -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <com.android.documentsui.sorting.HeaderCell
+                android:id="@android:id/title"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.4"
+                android:layout_marginEnd="12dp"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:animateLayoutChanges="true">
+
+                <include layout="@layout/shared_cell_content" />
+            </com.android.documentsui.sorting.HeaderCell>
+
+            <com.android.documentsui.sorting.HeaderCell
+                android:id="@android:id/summary"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0"
+                android:layout_marginEnd="0dp"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:animateLayoutChanges="true">
+
+                <include layout="@layout/shared_cell_content" />
+            </com.android.documentsui.sorting.HeaderCell>
+
+            <com.android.documentsui.sorting.HeaderCell
+                android:id="@+id/file_type"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.2"
+                android:layout_marginEnd="12dp"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:animateLayoutChanges="true">
+
+                <include layout="@layout/shared_cell_content" />
+            </com.android.documentsui.sorting.HeaderCell>
+
+            <com.android.documentsui.sorting.HeaderCell
+                android:id="@+id/size"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.2"
+                android:layout_marginEnd="12dp"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:animateLayoutChanges="true">
+
+                <include layout="@layout/shared_cell_content" />
+            </com.android.documentsui.sorting.HeaderCell>
+
+            <com.android.documentsui.sorting.HeaderCell
+                android:id="@+id/date"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.2"
+                android:layout_marginEnd="12dp"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:animateLayoutChanges="true">
+
+                <include layout="@layout/shared_cell_content" />
+            </com.android.documentsui.sorting.HeaderCell>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/directory_app_bar.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/directory_app_bar.xml
new file mode 100644
index 000000000..928659793
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/directory_app_bar.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+
+<com.google.android.material.appbar.AppBarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/app_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/colorBackground">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/actionBarSize"
+        android:layout_margin="@dimen/search_bar_margin"
+        android:background="?android:attr/colorBackground"
+        android:theme="?actionBarTheme"
+        android:popupTheme="?actionBarPopupTheme"
+        android:elevation="3dp"
+        app:collapseContentDescription="@string/button_back"
+        app:titleTextAppearance="@style/ToolbarTitle"
+        app:layout_collapseMode="pin">
+
+        <TextView
+            android:id="@+id/searchbar_title"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/actionBarSize"
+            android:layout_marginStart="@dimen/search_bar_text_margin_start"
+            android:layout_marginEnd="@dimen/search_bar_text_margin_end"
+            android:paddingStart="@dimen/search_bar_icon_padding"
+            android:gravity="center_vertical"
+            android:text="@string/search_bar_hint"
+            android:textAppearance="@style/SearchBarTitle"
+            android:drawableStart="@drawable/ic_menu_search"
+            android:drawablePadding="@dimen/search_bar_icon_padding"/>
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <include layout="@layout/directory_header"/>
+
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/item_doc_list.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/item_doc_list.xml
new file mode 100644
index 000000000..01cdd8c66
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/item_doc_list.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_item_background"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:orientation="horizontal" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:baselineAligned="false"
+        android:gravity="center_vertical"
+        android:minHeight="@dimen/list_item_height"
+        android:orientation="horizontal" >
+
+        <FrameLayout
+            android:id="@+id/icon"
+            android:pointerIcon="hand"
+            android:layout_width="@dimen/list_item_width"
+            android:layout_height="@dimen/list_item_height"
+            android:paddingBottom="@dimen/list_item_icon_padding"
+            android:paddingTop="@dimen/list_item_icon_padding"
+            android:paddingEnd="16dp"
+            android:paddingStart="@dimen/list_item_padding" >
+
+            <com.google.android.material.card.MaterialCardView
+                app:cardElevation="0dp"
+                app:cardBackgroundColor="@android:color/transparent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/icon_mime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:contentDescription="@null"
+                    android:scaleType="centerInside" />
+
+                <ImageView
+                    android:id="@+id/icon_thumb"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:contentDescription="@null"
+                    android:scaleType="centerCrop" />
+
+                <ImageView
+                    android:id="@+id/icon_check"
+                    android:layout_width="@dimen/check_icon_size"
+                    android:layout_height="@dimen/check_icon_size"
+                    android:layout_gravity="center"
+                    android:alpha="0"
+                    android:contentDescription="@null"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_check_circle" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+        </FrameLayout>
+
+        <!-- This is the one special case where we want baseline alignment! -->
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal" >
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.4"
+                android:layout_marginEnd="12dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/icon_profile_badge"
+                    android:layout_height="@dimen/briefcase_icon_size"
+                    android:layout_width="@dimen/briefcase_icon_size"
+                    android:layout_marginEnd="@dimen/briefcase_icon_margin"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/ic_briefcase"
+                    android:tint="?android:attr/colorAccent"
+                    android:contentDescription="@string/a11y_work"/>
+
+                <TextView
+                    android:id="@android:id/title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="middle"
+                    android:singleLine="true"
+                    android:textAlignment="viewStart"
+                    android:textAppearance="@style/Subhead"
+                    android:textColor="?android:attr/textColorPrimary"/>
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/file_type"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:layout_weight="0.2"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textAlignment="viewStart"
+                android:textAppearance="@style/Body1"
+                android:textColor="?android:attr/textColorSecondary" />
+
+            <TextView
+                android:id="@+id/size"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:layout_weight="0.2"
+                android:ellipsize="end"
+                android:minWidth="70dp"
+                android:singleLine="true"
+                android:textAlignment="viewEnd"
+                android:textAppearance="@style/Body1"
+                android:textColor="?android:attr/textColorSecondary" />
+
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:layout_weight="0.2"
+                android:ellipsize="end"
+                android:minWidth="70dp"
+                android:singleLine="true"
+                android:textAlignment="viewEnd"
+                android:textAppearance="@style/Body1"
+                android:textColor="?android:attr/textColorSecondary" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <FrameLayout
+                android:id="@+id/preview_icon"
+                android:layout_width="@dimen/list_item_width"
+                android:layout_height="@dimen/list_item_height"
+                android:padding="@dimen/list_item_icon_padding"
+                android:focusable="true">
+
+                <ImageView
+                    android:layout_width="@dimen/check_icon_size"
+                    android:layout_height="@dimen/check_icon_size"
+                    android:layout_gravity="center"
+                    android:scaleType="fitCenter"
+                    android:tint="?android:attr/textColorPrimary"
+                    android:src="@drawable/ic_zoom_out"/>
+
+            </FrameLayout>
+
+            <android.widget.Space
+                android:layout_width="@dimen/list_item_width"
+                android:layout_height="@dimen/list_item_height"/>
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/shared_cell_content.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/shared_cell_content.xml
new file mode 100644
index 000000000..9346933fd
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout-sw720dp/shared_cell_content.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 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.
+  -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <TextView
+        android:id="@+id/label"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/Subhead"
+        android:textColor="?android:attr/textColorSecondary"/>
+
+    <ImageView
+        android:id="@+id/sort_arrow"
+        android:layout_height="@dimen/doc_header_sort_icon_size"
+        android:layout_width="@dimen/doc_header_sort_icon_size"
+        android:layout_marginStart="3dp"
+        android:visibility="gone"
+        android:src="@drawable/ic_sort_arrow"
+        android:contentDescription="@null"/>
+</merge>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/apps_item.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/apps_item.xml
new file mode 100644
index 000000000..61241f761
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/apps_item.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:minWidth="@dimen/apps_row_item_width"
+    android:paddingBottom="@dimen/apps_row_exit_icon_margin_bottom"
+    android:orientation="vertical"
+    android:background="@drawable/generic_ripple_background"
+    android:gravity="center_horizontal">
+
+    <ImageView
+        android:id="@+id/app_icon"
+        android:layout_width="@dimen/apps_row_app_icon_size"
+        android:layout_height="@dimen/apps_row_app_icon_size"
+        android:layout_marginTop="@dimen/apps_row_app_icon_margin_top"
+        android:layout_marginBottom="@dimen/apps_row_app_icon_margin_bottom"
+        android:layout_marginStart="@dimen/apps_row_app_icon_margin_horizontal"
+        android:layout_marginEnd="@dimen/apps_row_app_icon_margin_horizontal"/>
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/apps_row_item_text_margin_horizontal"
+        android:layout_marginEnd="@dimen/apps_row_item_text_margin_horizontal"
+        android:textAppearance="@style/AppsItemText"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:gravity="center"/>
+
+    <TextView
+        android:id="@+id/summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/apps_row_item_text_margin_horizontal"
+        android:layout_marginEnd="@dimen/apps_row_item_text_margin_horizontal"
+        android:textAppearance="@style/AppsItemSubText"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:gravity="center"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/apps_row.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/apps_row.xml
new file mode 100644
index 000000000..0b8504a9a
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/apps_row.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/apps_row"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/apps_row_title_height"
+        android:paddingStart="@dimen/apps_row_title_padding_start"
+        android:textAppearance="@style/SortTitle"
+        android:text="@string/apps_row_title"
+        android:textAllCaps="true"
+        android:gravity="center"/>
+
+    <HorizontalScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true"
+        android:scrollbars="none">
+        <LinearLayout
+            android:id="@+id/apps_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"/>
+    </HorizontalScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/column_headers.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/column_headers.xml
new file mode 100644
index 000000000..bee221203
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/column_headers.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 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.
+-->
+
+<!-- A placeholder of table header on small screens. This won't inflate any view when it's included
+     into other layouts. -->
+<merge />
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_delete_confirmation.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_delete_confirmation.xml
new file mode 100644
index 000000000..80879ad00
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_delete_confirmation.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="24dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
+    android:textAppearance="@style/Subhead">
+</TextView>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_file_name.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_file_name.xml
new file mode 100644
index 000000000..7f2a9592b
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_file_name.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fitsSystemWindows="true">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/input_wrapper"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:layout_marginTop="@dimen/dialog_content_padding_top"
+        android:layout_marginBottom="@dimen/dialog_content_padding_bottom"
+        android:layout_centerInParent="true"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@android:id/text1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLength="255"
+            android:inputType="textCapSentences"/>
+
+    </com.google.android.material.textfield.TextInputLayout>
+</FrameLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_sorting.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_sorting.xml
new file mode 100644
index 000000000..d8cb7364c
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/dialog_sorting.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingTop="?android:attr/listPreferredItemPaddingStart"
+        android:paddingBottom="?android:attr/listPreferredItemPaddingStart"
+        android:textAllCaps="true"
+        android:text="@string/sort_dimension_dialog_title"
+        android:textAppearance="@style/SortTitle"/>
+
+    <ListView
+        android:id="@+id/sorting_dialog_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/directory_app_bar.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/directory_app_bar.xml
new file mode 100644
index 000000000..ad80ec201
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/directory_app_bar.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+
+<com.google.android.material.appbar.AppBarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/app_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/colorBackground">
+
+    <com.google.android.material.appbar.CollapsingToolbarLayout
+        android:id="@+id/collapsing_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="3dp"
+        app:titleEnabled="false"
+        app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed">
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/directory_header" />
+
+        </androidx.core.widget.NestedScrollView>
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/actionBarSize"
+            android:layout_margin="@dimen/search_bar_margin"
+            android:background="?android:attr/colorBackground"
+            android:theme="?actionBarTheme"
+            android:popupTheme="?actionBarPopupTheme"
+            android:elevation="@dimen/search_bar_elevation"
+            app:collapseContentDescription="@string/button_back"
+            app:titleTextAppearance="@style/ToolbarTitle"
+            app:layout_collapseMode="pin">
+
+            <TextView
+                android:id="@+id/searchbar_title"
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/actionBarSize"
+                android:gravity="center_vertical"
+                android:text="@string/search_bar_hint"
+                android:textAppearance="@style/SearchBarTitle" />
+
+        </androidx.appcompat.widget.Toolbar>
+
+    </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/directory_header.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/directory_header.xml
new file mode 100644
index 000000000..af730829f
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/directory_header.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/directory_header"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <com.android.documentsui.HorizontalBreadcrumb
+        android:id="@+id/horizontal_breadcrumb"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/colorBackground"/>
+
+    <!-- used for search chip. -->
+    <include layout="@layout/search_chip_row"/>
+
+    <LinearLayout
+        android:id="@+id/tabs_container"
+        android:theme="@style/TabTheme"
+        android:clipToPadding="true"
+        android:clipChildren="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="@dimen/profile_tab_padding"
+        android:paddingRight="@dimen/profile_tab_padding"
+        android:orientation="vertical">
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tabs"
+            android:background="@android:color/transparent"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:tabMaxWidth="0dp"
+            app:tabGravity="fill"
+            app:tabMode="fixed"
+            app:tabIndicatorColor="?android:attr/colorAccent"
+            app:tabIndicatorHeight="@dimen/tab_selector_indicator_height"
+            app:tabSelectedTextColor="@color/tab_selected_text_color"
+            app:tabTextAppearance="@style/TabTextAppearance"
+            app:tabTextColor="@color/tab_unselected_text_color"/>
+        <View
+            android:id="@+id/tab_separator"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?android:attr/listDivider"/>
+    </LinearLayout>
+
+    <!-- used for apps row. -->
+    <include layout="@layout/apps_row"/>
+
+    <LinearLayout
+        android:id="@+id/header_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/root_info_header_horizontal_padding"
+        android:layout_marginEnd="@dimen/root_info_header_horizontal_padding"
+        android:minHeight="@dimen/root_info_header_height"
+        android:accessibilityHeading="true">
+
+        <TextView
+            android:id="@+id/header_title"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:textAppearance="@style/SectionHeader"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:gravity="start|center_vertical"/>
+
+        <androidx.appcompat.widget.ActionMenuView
+            android:id="@+id/sub_menu"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|center_vertical"/>
+
+    </LinearLayout>
+
+    <!-- column headers are empty on small screens, in portrait or in grid mode. -->
+    <include layout="@layout/column_headers"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/drag_shadow_layout.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/drag_shadow_layout.xml
new file mode 100644
index 000000000..591e81375
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/drag_shadow_layout.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<!-- Transparent container so shadow layer can be drawn -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="8dp"
+    android:background="@color/item_drag_shadow_container_background">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:background="@drawable/drag_shadow_background">
+
+        <include layout="@layout/drop_badge"/>
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textAlignment="viewStart"
+            android:textAppearance="@style/Subhead"
+            android:paddingStart="6dp"
+            android:paddingBottom="1dp"/>
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/drawer_layout.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/drawer_layout.xml
new file mode 100644
index 000000000..d08c17d9f
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/drawer_layout.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- CoordinatorLayout is necessary for various components (e.g. Snackbars, and
+     floating action buttons) to operate correctly. -->
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/coordinator_layout">
+
+    <androidx.drawerlayout.widget.DrawerLayout
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_behavior="@string/scrolling_behavior">
+
+                <FrameLayout
+                    android:id="@+id/container_directory"
+                    android:clipToPadding="false"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1" />
+
+                <FrameLayout
+                    android:id="@+id/container_search_fragment"
+                    android:clipToPadding="false"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
+                <!-- Drawer edge is a placeholder view used to capture hovering
+                     event on view edge to open the drawer. (b/28345294) -->
+                <View
+                    android:id="@+id/drawer_edge"
+                    android:background="@android:color/transparent"
+                    android:layout_width="@dimen/drawer_edge_width"
+                    android:layout_height="match_parent"/>
+            </FrameLayout>
+
+            <androidx.coordinatorlayout.widget.CoordinatorLayout
+                android:id="@+id/container_save"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|center_horizontal"
+                android:background="?android:attr/colorBackgroundFloating"
+                android:elevation="8dp" />
+
+            <include layout="@layout/directory_app_bar"/>
+
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+        <LinearLayout
+            android:id="@+id/drawer_roots"
+            android:layout_width="256dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:orientation="vertical"
+            android:elevation="0dp"
+            android:background="?android:attr/colorBackground">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/roots_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/actionBarSize"
+                android:background="?android:attr/colorBackground"
+                android:elevation="0dp"
+                app:titleTextAppearance="@style/DrawerMenuTitle"
+                app:titleTextColor="?android:colorAccent"/>
+
+            <FrameLayout
+                android:id="@+id/container_roots"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+        </LinearLayout>
+
+    </androidx.drawerlayout.widget.DrawerLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/drop_badge.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/drop_badge.xml
new file mode 100644
index 000000000..e17fa1ce0
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/drop_badge.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<com.android.documentsui.DropBadgeView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@android:id/icon"
+        android:layout_width="26dp"
+        android:layout_height="26dp"
+        android:scaleType="centerInside"
+        android:contentDescription="@null"
+        android:duplicateParentState="true"/>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/fixed_layout.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fixed_layout.xml
new file mode 100644
index 000000000..fb2cb2452
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fixed_layout.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- CoordinatorLayout is necessary for various components (e.g. Snackbars, and
+     floating action buttons) to operate correctly. -->
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/coordinator_layout"
+    android:focusable="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/actionBarSize"
+            android:layout_margin="@dimen/search_bar_margin"
+            android:background="?android:attr/colorBackground"
+            android:elevation="3dp"
+            android:theme="?actionBarTheme"
+            android:popupTheme="?actionBarPopupTheme"
+            app:collapseContentDescription="@string/button_back"
+            app:titleTextAppearance="@style/ToolbarTitle">
+
+            <TextView
+                android:id="@+id/searchbar_title"
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/actionBarSize"
+                android:layout_marginStart="@dimen/search_bar_text_margin_start"
+                android:layout_marginEnd="@dimen/search_bar_text_margin_end"
+                android:paddingStart="@dimen/search_bar_icon_padding"
+                android:gravity="center_vertical"
+                android:text="@string/search_bar_hint"
+                android:textAppearance="@style/SearchBarTitle"
+                android:drawableStart="@drawable/ic_menu_search"
+                android:drawablePadding="@dimen/search_bar_icon_padding"/>
+
+        </androidx.appcompat.widget.Toolbar>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            android:baselineAligned="false">
+
+            <FrameLayout
+                android:id="@+id/container_roots"
+                android:layout_width="256dp"
+                android:layout_height="match_parent" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:elevation="8dp">
+
+                <include layout="@layout/directory_header" />
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1">
+
+                    <FrameLayout
+                        android:id="@+id/container_directory"
+                        android:clipToPadding="false"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+
+                    <FrameLayout
+                        android:id="@+id/container_search_fragment"
+                        android:clipToPadding="false"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+
+                </FrameLayout>
+
+                <androidx.coordinatorlayout.widget.CoordinatorLayout
+                    android:id="@+id/container_save"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?android:attr/colorBackgroundFloating"
+                    android:elevation="8dp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_directory.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_directory.xml
new file mode 100644
index 000000000..015039a6a
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_directory.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<com.android.documentsui.dirlist.AnimationView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/colorBackground"
+    android:outlineProvider="bounds"
+    android:elevation="4dp"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:id="@+id/progressbar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/progress_bar_height"
+        android:indeterminate="true"
+        style="@style/TrimmedHorizontalProgressBar"
+        android:visibility="gone"/>
+
+    <com.android.documentsui.dirlist.DocumentsSwipeRefreshLayout
+        android:id="@+id/refresh_layout"
+        android:background="@android:color/transparent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/dir_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
+            android:paddingTop="0dp"
+            android:paddingBottom="0dp"
+            android:clipToPadding="false"
+            android:scrollbars="none"
+            android:drawSelectorOnTop="true"
+            app:fastScrollEnabled="false"/>
+
+    </com.android.documentsui.dirlist.DocumentsSwipeRefreshLayout>
+
+</com.android.documentsui.dirlist.AnimationView>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml
new file mode 100644
index 000000000..cba4ecb9a
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_pick.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2014 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:baselineAligned="false"
+    android:gravity="center_vertical|end"
+    android:paddingStart="@dimen/bottom_bar_padding"
+    android:paddingEnd="@dimen/bottom_bar_padding">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@android:id/button2"
+        style="?attr/materialButtonOutlinedStyle"
+        app:cornerRadius="@dimen/button_corner_radius"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:text="@android:string/cancel" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@android:id/button1"
+            style="?attr/materialButtonStyle"
+            app:cornerRadius="@dimen/button_corner_radius"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:backgroundTint="@color/fragment_pick_button_background_color"
+            android:textColor="@color/fragment_pick_button_text_color"
+            android:layout_marginEnd="4dp" />
+
+        <!-- Handles touch events when button1 is disabled. -->
+        <FrameLayout
+            android:id="@+id/pick_button_overlay"
+            android:importantForAccessibility="no"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_roots.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_roots.xml
new file mode 100644
index 000000000..af7861992
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_roots.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<com.android.documentsui.sidebar.RootsList xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/roots_list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="8dp"
+    android:keyboardNavigationCluster="true"
+    android:divider="@null"/>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_save.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_save.xml
new file mode 100644
index 000000000..0f46b2a9c
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_save.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/list_item_padding"
+    android:paddingEnd="@dimen/bottom_bar_padding"
+    android:orientation="horizontal"
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall">
+
+    <FrameLayout
+        android:layout_width="@dimen/icon_size"
+        android:layout_height="@dimen/icon_size"
+        android:layout_marginEnd="16dp">
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@dimen/root_icon_size"
+            android:layout_height="match_parent"
+            android:scaleType="centerInside"
+            android:contentDescription="@null" />
+
+    </FrameLayout>
+
+    <EditText
+        android:id="@android:id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:singleLine="true"
+        android:selectAllOnFocus="true" />
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@android:id/button1"
+            style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+            app:cornerRadius="@dimen/button_corner_radius"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
+            android:text="@string/menu_save"/>
+
+        <ProgressBar
+            android:id="@android:id/progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone"
+            android:indeterminate="true"
+            android:padding="8dp"
+            style="?android:attr/progressBarStyle" />
+
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_search.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_search.xml
new file mode 100644
index 000000000..02baffdd3
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/fragment_search.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/colorBackground">
+
+    <!-- used for search chip. -->
+    <include layout="@layout/search_chip_row"/>
+
+    <ListView
+        android:id="@+id/history_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:divider="@null"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_action_view.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_action_view.xml
new file mode 100644
index 000000000..422638348
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_action_view.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        layout="@layout/inspector_section_title"
+        android:id="@+id/action_header" />
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/default_app_info"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="10dp"
+        android:layout_below="@id/action_header">
+
+        <ImageView
+            android:id="@+id/app_icon"
+            android:paddingLeft="5dp"
+            android:layout_width="50dp"
+            android:layout_height="50dp" />
+
+        <TextView
+            android:id="@+id/app_name"
+            android:paddingLeft="16dp"
+            android:paddingBottom="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/app_icon"
+            android:layout_centerVertical="true"/>
+
+        <ImageButton
+            android:id="@+id/inspector_action_button"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:background="@null"/>
+
+        </RelativeLayout>
+
+</RelativeLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_activity.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_activity.xml
new file mode 100644
index 000000000..8763351c9
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_activity.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2017 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.
+-->
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/inspector_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:colorBackground">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/actionBarSize"
+            app:titleEnabled="false"
+            app:statusBarScrim="@android:color/transparent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <android.widget.Space
+                    android:layout_width="match_parent"
+                    android:layout_height="?android:attr/actionBarSize"/>
+
+                <com.android.documentsui.inspector.HeaderView
+                    android:id="@+id/inspector_header_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/inspector_header_height"
+                    app:layout_collapseMode="parallax"/>
+            </LinearLayout>
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/actionBarSize"
+                android:background="?android:attr/colorBackground"
+                android:theme="?actionBarTheme"
+                app:title="@string/inspector_title"
+                app:titleTextAppearance="@style/ToolbarTitle"
+                app:layout_collapseMode="pin">
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:behavior_overlapTop="10dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:id="@+id/inspector_container"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/bottom_sheet_dialog_background"
+            android:paddingBottom="5dp">
+
+            <com.android.documentsui.inspector.DetailsView
+                android:id="@+id/inspector_details_view"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <com.android.documentsui.inspector.MediaView
+                android:id="@+id/inspector_media_view"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <com.android.documentsui.inspector.actions.ActionView
+                android:id="@+id/inspector_show_in_provider_view"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"/>
+
+            <com.android.documentsui.inspector.actions.ActionView
+                android:id="@+id/inspector_app_defaults_view"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"/>
+
+            <com.android.documentsui.inspector.DebugView
+                android:id="@+id/inspector_debug_view"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="20dp"
+                android:visibility="gone" />
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_header.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_header.xml
new file mode 100644
index 000000000..94a092790
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_header.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/inspector_thumbnail"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitCenter"
+        android:alpha="0.0"
+        android:background="?android:colorBackgroundFloating" />
+
+</RelativeLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_section_title.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_section_title.xml
new file mode 100644
index 000000000..358b9613c
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/inspector_section_title.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2017 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:divider="@drawable/inspector_separator"
+    android:showDividers="beginning"
+    android:paddingStart="10dp"
+    android:paddingEnd="10dp">
+
+    <!--Empty view for keeping divider when title is gone-->
+    <android.widget.Space
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content">
+    </android.widget.Space >
+
+    <TextView
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:id="@+id/inspector_header_title"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="25dp"
+        android:paddingBottom="25dp"
+        android:layout_gravity="center_vertical"
+        android:clickable="false"
+        android:textAppearance="@style/ToolbarTitle"
+        android:textAlignment="viewStart"
+        android:textIsSelectable="true"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_dir_grid.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_dir_grid.xml
new file mode 100644
index 000000000..bd690d4d3
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_dir_grid.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+-->
+
+<!-- FYI: This layout has an extra top level container view that was previously used
+     to allow for the insertion of debug info. The debug info is now gone, but the
+     container remains because there is a high likelihood of UI regression relating
+     to focus and selection states, some of which are specific to keyboard
+     when touch mode is not enable. So, if you, heroic engineer of the future,
+     decide to rip these out, please be sure to check out focus and keyboards. -->
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/item_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="4dp"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    app:cardElevation="0dp">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="0dp"
+        android:duplicateParentState="true"
+        app:cardElevation="0dp"
+        app:strokeWidth="1dp"
+        app:strokeColor="?android:strokeColor">
+
+        <!-- The height is 48px.
+             paddingTop (9dp) + @dimen/check_icon_size (30dp) + paddingBottom (9dp) -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:background="?android:attr/colorBackground"
+            android:gravity="center_vertical">
+
+            <FrameLayout
+                android:id="@+id/icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:pointerIcon="hand"
+                android:paddingBottom="9dp"
+                android:paddingStart="9dp"
+                android:paddingEnd="8dp"
+                android:paddingTop="9dp">
+
+                <ImageView
+                    android:id="@+id/icon_mime_sm"
+                    android:layout_width="@dimen/grid_item_icon_size"
+                    android:layout_height="@dimen/grid_item_icon_size"
+                    android:layout_gravity="center"
+                    android:contentDescription="@null"
+                    android:scaleType="centerInside"/>
+
+                <ImageView
+                    android:id="@+id/icon_check"
+                    android:layout_width="@dimen/check_icon_size"
+                    android:layout_height="@dimen/check_icon_size"
+                    android:alpha="0"
+                    android:contentDescription="@null"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_check_circle"/>
+
+            </FrameLayout>
+
+            <ImageView
+                android:id="@+id/icon_profile_badge"
+                android:layout_height="@dimen/briefcase_icon_size"
+                android:layout_width="@dimen/briefcase_icon_size"
+                android:layout_marginEnd="@dimen/briefcase_icon_margin"
+                android:src="@drawable/ic_briefcase"
+                android:tint="?android:attr/colorAccent"
+                android:contentDescription="@string/a11y_work"/>
+
+            <TextView
+                android:id="@android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textAlignment="viewStart"
+                android:textAppearance="@style/CardPrimaryText"
+                android:layout_marginBottom="9dp"
+                android:layout_marginEnd="12dp"
+                android:layout_marginTop="9dp"/>
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <!-- An overlay that draws the item border when it is focused. -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/item_doc_grid_border_rounded"
+        android:contentDescription="@null"
+        android:duplicateParentState="true"/>
+
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_grid.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_grid.xml
new file mode 100644
index 000000000..d654571eb
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_grid.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- FYI: This layout has an extra top level container view that was previously used
+     to allow for the insertion of debug info. The debug info is now gone, but the
+     container remains because there is a high likelihood of UI regression relating
+     to focus and selection states, some of which are specific to keyboard
+     when touch mode is not enable. So, if you, heroic engineer of the future,
+     decide to rip these out, please be sure to check out focus and keyboards. -->
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/item_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="4dp"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    app:cardElevation="0dp">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="0dp"
+        android:duplicateParentState="true"
+        app:cardElevation="0dp"
+        app:strokeWidth="1dp"
+        app:strokeColor="?android:strokeColor">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:duplicateParentState="true">
+
+            <!-- Main item thumbnail.  Comprised of two overlapping images, the
+                 visibility of which is controlled by code in
+                 DirectoryFragment.java. -->
+
+            <FrameLayout
+                android:id="@+id/thumbnail"
+                android:background="?attr/gridItemTint"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.android.documentsui.GridItemThumbnail
+                    android:id="@+id/icon_thumb"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@null"
+                    android:tint="?attr/gridItemTint"
+                    android:tintMode="src_over"/>
+
+                <com.android.documentsui.GridItemThumbnail
+                    android:id="@+id/icon_mime_lg"
+                    android:layout_width="@dimen/icon_size"
+                    android:layout_height="@dimen/icon_size"
+                    android:layout_gravity="center"
+                    android:scaleType="fitCenter"
+                    android:contentDescription="@null"/>
+
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/preview_icon"
+                android:layout_width="@dimen/button_touch_size"
+                android:layout_height="@dimen/button_touch_size"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true"
+                android:pointerIcon="hand"
+                android:focusable="true"
+                android:clickable="true">
+
+                <ImageView
+                    android:layout_width="@dimen/zoom_icon_size"
+                    android:layout_height="@dimen/zoom_icon_size"
+                    android:padding="2dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/circle_button_background"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_zoom_out"/>
+
+            </FrameLayout>
+
+            <!-- Item nameplate.  Has a mime-type icon and some text fields (title,
+                 size, mod-time, etc). -->
+
+            <LinearLayout
+                android:id="@+id/nameplate"
+                android:background="?android:attr/colorBackground"
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/thumbnail">
+
+                <FrameLayout
+                    android:id="@+id/icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_centerVertical="true"
+                    android:pointerIcon="hand"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    android:paddingStart="12dp"
+                    android:paddingEnd="8dp">
+
+                    <ImageView
+                        android:id="@+id/icon_mime_sm"
+                        android:layout_width="@dimen/grid_item_icon_size"
+                        android:layout_height="@dimen/grid_item_icon_size"
+                        android:layout_gravity="center"
+                        android:scaleType="center"
+                        android:contentDescription="@null"/>
+
+                    <ImageView
+                        android:id="@+id/icon_check"
+                        android:src="@drawable/ic_check_circle"
+                        android:alpha="0"
+                        android:layout_width="@dimen/check_icon_size"
+                        android:layout_height="@dimen/check_icon_size"
+                        android:layout_gravity="center"
+                        android:scaleType="fitCenter"
+                        android:contentDescription="@null"/>
+
+                </FrameLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="8dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="12dp">
+
+                    <ImageView
+                        android:id="@+id/icon_profile_badge"
+                        android:layout_height="@dimen/briefcase_icon_size"
+                        android:layout_width="@dimen/briefcase_icon_size"
+                        android:layout_marginEnd="@dimen/briefcase_icon_margin"
+                        android:layout_alignTop="@android:id/title"
+                        android:layout_alignBottom="@android:id/title"
+                        android:gravity="center_vertical"
+                        android:src="@drawable/ic_briefcase"
+                        android:tint="?android:attr/colorAccent"
+                        android:contentDescription="@string/a11y_work"/>
+
+                    <TextView
+                        android:id="@android:id/title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentTop="true"
+                        android:layout_toEndOf="@+id/icon_profile_badge"
+                        android:singleLine="true"
+                        android:ellipsize="end"
+                        android:textAlignment="viewStart"
+                        android:textAppearance="@style/CardPrimaryText"/>
+
+                    <TextView
+                        android:id="@+id/details"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@android:id/title"
+                        android:layout_marginEnd="4dp"
+                        android:singleLine="true"
+                        android:ellipsize="end"
+                        android:textAlignment="viewStart"
+                        android:textAppearance="@style/ItemCaptionText" />
+
+                    <TextView
+                        android:id="@+id/date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@android:id/title"
+                        android:layout_toEndOf="@id/details"
+                        android:singleLine="true"
+                        android:ellipsize="end"
+                        android:textAlignment="viewStart"
+                        android:textAppearance="@style/ItemCaptionText" />
+
+                </RelativeLayout>
+
+            </LinearLayout>
+
+        </RelativeLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <!-- An overlay that draws the item border when it is focused. -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/item_doc_grid_border_rounded"
+        android:contentDescription="@null"
+        android:duplicateParentState="true"/>
+
+</com.google.android.material.card.MaterialCardView>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_header_message.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_header_message.xml
new file mode 100644
index 000000000..4b2cf355f
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_header_message.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/item_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="4dp"
+        android:elevation="0dp"
+        android:duplicateParentState="true"
+        app:cardElevation="0dp"
+        app:strokeWidth="1dp"
+        app:strokeColor="?android:strokeColor">
+
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:background="?android:attr/colorBackground"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:animateLayoutChanges="true"
+                android:id="@+id/message_container"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:minHeight="60dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:contentDescription="@null"
+                    android:id="@+id/message_icon"
+                    android:layout_height="@dimen/icon_size"
+                    android:layout_width="@dimen/icon_size"
+                    android:layout_margin="8dp"
+                    android:layout_gravity="center"
+                    android:scaleType="centerInside"/>
+
+                <LinearLayout
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:minHeight="48dp"
+                    android:paddingTop="12dp"
+                    android:paddingEnd="12dp"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/message_title"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:textSize="16sp"
+                        android:textAppearance="@style/DrawerMenuPrimary"/>
+
+                    <TextView
+                        android:id="@+id/message_subtitle"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:selectAllOnFocus="true"
+                        android:textSize="12sp"/>
+
+                    <TextView
+                        android:id="@+id/message_textview"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:selectAllOnFocus="true"/>
+
+                    <Button
+                        android:id="@+id/dismiss_button"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:layout_gravity="end"
+                        android:text="@android:string/ok"
+                        style="@style/DialogTextButton"/>
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/action_view"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:orientation="vertical">
+
+                <Button
+                    android:id="@+id/action_button"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_gravity="end"
+                    style="@style/DialogTextButton"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+</FrameLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message.xml
new file mode 100644
index 000000000..abfdbfd10
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/empty"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/colorBackground"
+    android:focusable="true">
+
+    <include android:id="@+id/content" layout="@layout/item_doc_inflated_message_content"/>
+    <include android:id="@+id/cross_profile"
+             layout="@layout/item_doc_inflated_message_cross_profile"/>
+</FrameLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message_content.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message_content.xml
new file mode 100644
index 000000000..0635e1654
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message_content.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/artwork"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="25dp"
+        android:layout_marginBottom="25dp"
+        android:scaleType="fitCenter"
+        android:maxHeight="250dp"
+        android:adjustViewBounds="true"
+        android:gravity="bottom|center_horizontal"
+        android:contentDescription="@null"/>
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="25dp"
+        android:gravity="center_horizontal"
+        style="?android:attr/textAppearanceListItem"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message_cross_profile.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message_cross_profile.xml
new file mode 100644
index 000000000..3cc0d7ce2
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_inflated_message_cross_profile.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:paddingTop="@dimen/item_doc_inflated_message_padding_top"
+    android:paddingStart="72dp"
+    android:paddingEnd="72dp">
+
+    <ProgressBar
+        android:id="@+id/cross_profile_progress"
+        style="@android:style/Widget.Material.Light.ProgressBar"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:indeterminateTint="?attr/colorAccent"/>
+
+    <LinearLayout
+        android:id="@+id/cross_profile_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center_horizontal">
+
+        <ImageView
+            android:id="@+id/artwork"
+            android:layout_width="24dp"
+            android:layout_height="24dp"/>
+        <TextView
+            android:id="@+id/title"
+            android:layout_marginTop="8dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textAppearance="@style/EmptyStateTitleText"/>
+        <TextView
+            android:id="@+id/message"
+            android:layout_marginTop="@dimen/cross_profile_button_message_margin_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textAppearance="@style/EmptyStateMessageText"/>
+        <Button
+            android:id="@+id/button"
+            android:layout_marginTop="16dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:cornerRadius="@dimen/cross_profile_button_corner_radius"
+            app:strokeWidth="@dimen/cross_profile_button_stroke_width"
+            app:strokeColor="@color/work_profile_button_stroke_color"
+            style="@style/EmptyStateButton"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_list.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_list.xml
new file mode 100644
index 000000000..77494a29c
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_doc_list.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+     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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/item_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_item_background"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:baselineAligned="false"
+        android:gravity="center_vertical"
+        android:minHeight="@dimen/list_item_height"
+        android:orientation="horizontal">
+
+      <FrameLayout
+          android:id="@+id/icon"
+          android:pointerIcon="hand"
+          android:layout_width="@dimen/list_item_width"
+          android:layout_height="@dimen/list_item_height"
+          android:paddingBottom="@dimen/list_item_icon_padding"
+          android:paddingTop="@dimen/list_item_icon_padding"
+          android:paddingEnd="16dp"
+          android:paddingStart="@dimen/list_item_padding">
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:cardBackgroundColor="@android:color/transparent"
+            app:cardElevation="0dp">
+
+          <ImageView
+              android:id="@+id/icon_mime"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center"
+              android:contentDescription="@null"
+              android:scaleType="centerInside" />
+
+          <ImageView
+              android:id="@+id/icon_thumb"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:contentDescription="@null"
+              android:scaleType="centerCrop" />
+
+          <ImageView
+              android:id="@+id/icon_check"
+              android:layout_width="@dimen/check_icon_size"
+              android:layout_height="@dimen/check_icon_size"
+              android:layout_gravity="center"
+              android:alpha="0"
+              android:contentDescription="@null"
+              android:scaleType="fitCenter"
+              android:src="@drawable/ic_check_circle" />
+
+        </com.google.android.material.card.MaterialCardView>
+
+      </FrameLayout>
+
+      <LinearLayout
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="vertical"
+          android:layout_gravity="center_vertical"
+          android:layout_marginEnd="@dimen/list_item_padding">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+          <ImageView
+              android:id="@+id/icon_profile_badge"
+              android:layout_height="@dimen/briefcase_icon_size"
+              android:layout_width="@dimen/briefcase_icon_size"
+              android:layout_marginEnd="@dimen/briefcase_icon_margin"
+              android:layout_gravity="center_vertical"
+              android:src="@drawable/ic_briefcase"
+              android:tint="?android:attr/colorAccent"
+              android:contentDescription="@string/a11y_work" />
+
+          <TextView
+              android:id="@android:id/title"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:ellipsize="end"
+              android:singleLine="true"
+              android:textAlignment="viewStart"
+              android:textAppearance="?android:attr/textAppearanceListItem" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/line2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:baselineAligned="false"
+            android:layout_marginTop="4dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+          <TextView
+              android:id="@+id/metadata"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:ellipsize="end"
+              android:singleLine="true"
+              android:textAppearance="@style/ItemCaptionText" />
+
+        </LinearLayout>
+
+      </LinearLayout>
+
+      <FrameLayout
+          android:id="@+id/preview_icon"
+          android:layout_width="@dimen/list_item_width"
+          android:layout_height="@dimen/list_item_height"
+          android:padding="@dimen/list_item_icon_padding"
+          android:focusable="true"
+          android:clickable="true">
+
+        <ImageView
+            android:layout_width="@dimen/check_icon_size"
+            android:layout_height="@dimen/check_icon_size"
+            android:layout_gravity="center"
+            android:scaleType="fitCenter"
+            android:tint="?android:attr/colorControlNormal"
+            android:src="@drawable/ic_zoom_out" />
+
+      </FrameLayout>
+
+    </LinearLayout>
+
+  <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:layout_marginStart="72dp"
+      android:layout_marginEnd="8dp"
+      android:background="?android:strokeColor" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_history.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_history.xml
new file mode 100644
index 000000000..7bb76b35b
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_history.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:gravity="center_vertical">
+
+    <ImageView
+        android:layout_width="@dimen/button_touch_size"
+        android:layout_height="@dimen/button_touch_size"
+        android:src="@drawable/ic_history"
+        android:scaleType="centerInside"/>
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:textAppearance="?android:attr/textAppearanceListItem"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:gravity="center_vertical"/>
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="@dimen/button_touch_size"
+        android:layout_height="@dimen/button_touch_size"
+        android:background="@drawable/generic_ripple_background"
+        android:src="@drawable/ic_action_clear"
+        android:scaleType="centerInside"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_photo_grid.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_photo_grid.xml
new file mode 100644
index 000000000..4581d3d25
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_photo_grid.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+
+<!-- FYI: This layout has an extra top level container view that was previously used
+     to allow for the insertion of debug info. The debug info is now gone, but the
+     container remains because there is a high likelihood of UI regression relating
+     to focus and selection states, some of which are specific to keyboard
+     when touch mode is not enable. So, if you, heroic engineer of the future,
+     decide to rip these out, please be sure to check out focus and keyboards. -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_margin="4dp"
+    android:background="@drawable/grid_item_background"
+    android:elevation="@dimen/grid_item_elevation"
+    android:focusable="true">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:duplicateParentState="true">
+
+        <!-- Main item thumbnail. Comprised of two overlapping images, the
+             visibility of which is controlled by code in
+             DirectoryFragment.java. -->
+
+        <FrameLayout
+            android:id="@+id/thumbnail"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.android.documentsui.GridItemThumbnail
+                android:id="@+id/icon_thumb"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                android:tint="?attr/gridItemTint"
+                android:tintMode="src_over"/>
+
+            <com.android.documentsui.GridItemThumbnail
+                android:id="@+id/icon_mime_lg"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="@dimen/icon_size"
+                android:layout_gravity="center"
+                android:scaleType="fitCenter"
+                android:contentDescription="@null"/>
+
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="@dimen/button_touch_size"
+            android:layout_height="@dimen/button_touch_size"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentStart="true"
+            android:pointerIcon="hand">
+
+            <ImageView
+                android:id="@+id/icon_check"
+                android:src="@drawable/ic_check_circle"
+                android:alpha="0"
+                android:layout_width="@dimen/check_icon_size"
+                android:layout_height="@dimen/check_icon_size"
+                android:layout_gravity="center"
+                android:scaleType="fitCenter"
+                android:contentDescription="@null"/>
+
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/preview_icon"
+            android:layout_width="@dimen/button_touch_size"
+            android:layout_height="@dimen/button_touch_size"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true"
+            android:pointerIcon="hand"
+            android:focusable="true"
+            android:clickable="true">
+
+            <ImageView
+                android:layout_width="@dimen/zoom_icon_size"
+                android:layout_height="@dimen/zoom_icon_size"
+                android:padding="2dp"
+                android:layout_gravity="center"
+                android:background="@drawable/circle_button_background"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_zoom_out"/>
+
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/icon_profile_badge"
+            android:layout_width="@dimen/button_touch_size"
+            android:layout_height="@dimen/button_touch_size"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:pointerIcon="hand">
+
+            <ImageView
+                android:id="@+id/icon_id"
+                android:layout_height="@dimen/briefcase_icon_size_photo"
+                android:layout_width="@dimen/briefcase_icon_size_photo"
+                android:src="@drawable/ic_briefcase_white"
+                android:tint="?android:attr/colorAccent"
+                android:padding="5dp"
+                android:background="@drawable/circle_button_background"
+                android:layout_gravity="center"
+                android:scaleType="fitCenter"
+                android:contentDescription="@string/a11y_work"/>
+        </FrameLayout>
+
+        <!-- An overlay that draws the item border when it is focused. -->
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/thumbnail"
+            android:layout_alignTop="@id/thumbnail"
+            android:layout_alignLeft="@id/thumbnail"
+            android:layout_alignRight="@id/thumbnail"
+            android:contentDescription="@null"
+            android:background="@drawable/item_doc_grid_border"
+            android:duplicateParentState="true"/>
+
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root.xml
new file mode 100644
index 000000000..8d0f86bad
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<com.android.documentsui.sidebar.RootItemView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="52dp"
+    android:paddingStart="24dp"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:baselineAligned="false"
+    android:background="@drawable/root_item_background">
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/icon_size"
+        android:duplicateParentState="true">
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@dimen/root_icon_size"
+            android:layout_height="match_parent"
+            android:scaleType="centerInside"
+            android:contentDescription="@null"
+            android:duplicateParentState="true" />
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:orientation="vertical"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textAlignment="viewStart"
+            android:textAppearance="@style/DrawerMenuPrimary" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textAlignment="viewStart"
+            android:textAppearance="@style/DrawerMenuSecondary" />
+
+    </LinearLayout>
+
+    <include layout="@layout/root_vertical_divider" />
+
+    <FrameLayout
+        android:id="@+id/action_icon_area"
+        android:layout_width="@dimen/button_touch_size"
+        android:layout_height="@dimen/button_touch_size"
+        android:paddingEnd="@dimen/grid_padding_horiz"
+        android:duplicateParentState="true"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/action_icon"
+            android:focusable="false"
+            android:layout_width="@dimen/root_action_icon_size"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:scaleType="centerInside"/>
+
+    </FrameLayout>
+
+</com.android.documentsui.sidebar.RootItemView>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root_header.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root_header.xml
new file mode 100644
index 000000000..f82b1577d
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root_header.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:gravity="center_vertical">
+
+    <TextView
+        android:id="@android:id/title"
+        android:paddingStart="64dp"
+        android:layout_width="wrap_content"
+        android:layout_height="44dp"
+        android:gravity="center_vertical"
+        style="@style/DrawerMenuHeader"/>
+
+</LinearLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root_spacer.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root_spacer.xml
new file mode 100644
index 000000000..16ecee7fd
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/item_root_spacer.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/root_spacer_padding"
+    android:paddingTop="12dp"
+    android:paddingBottom="12dp">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/listDivider" />
+
+</FrameLayout>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/navigation_breadcrumb_item.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/navigation_breadcrumb_item.xml
new file mode 100644
index 000000000..93d3feb3f
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/navigation_breadcrumb_item.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 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.
+-->
+
+
+<!--
+     CoordinatorLayout is necessary for various components (e.g. Snackbars, and
+     floating action buttons) to operate correctly.
+-->
+<!--
+     focusableInTouchMode is set in order to force key events to go to the activity's global key
+     callback, which is necessary for proper event routing. See BaseActivity.onKeyDown.
+-->
+
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  android:minHeight="48dp"
+  android:focusable="true"
+  android:gravity="center_vertical"
+  android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/breadcrumb_text"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:maxWidth="275dp"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:textAppearance="@style/BreadcrumbText"
+        android:background="@drawable/breadcrumb_item_background" />
+
+    <ImageView
+        android:id="@+id/breadcrumb_arrow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_breadcrumb_arrow"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/root_vertical_divider.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/root_vertical_divider.xml
new file mode 100644
index 000000000..6b9c72341
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/root_vertical_divider.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2018 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.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/vertical_divider"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:gravity="start|center_vertical"
+    android:orientation="horizontal"
+    android:paddingTop="@dimen/drawer_edge_width"
+    android:paddingBottom="@dimen/drawer_edge_width"
+    android:paddingStart="@dimen/grid_padding_horiz"
+    android:paddingEnd="@dimen/grid_padding_horiz"
+    android:visibility="gone">
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="?android:attr/listDivider"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/search_chip_item.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/search_chip_item.xml
new file mode 100644
index 000000000..3ee00c290
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/search_chip_item.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+
+<com.google.android.material.chip.Chip
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:checkable="true"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/search_chip_half_spacing"
+    android:layout_marginEnd="@dimen/search_chip_half_spacing"
+    android:textAppearance="@style/SearchChipText"
+    android:textColor="@color/search_chip_text_color"
+    app:checkedIcon="@drawable/ic_check"
+    app:chipBackgroundColor="@color/search_chip_background_color"
+    app:chipCornerRadius="@dimen/search_chip_radius"
+    app:chipStrokeColor="@color/search_chip_stroke_color"
+    app:chipStrokeWidth="1dp"
+    app:iconStartPadding="@dimen/search_chip_icon_padding"
+    app:rippleColor="@color/search_chip_ripple_color"
+    app:chipMinTouchTargetSize="@dimen/button_touch_size"
+/>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/search_chip_row.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/search_chip_row.xml
new file mode 100644
index 000000000..ad0ac43c8
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/search_chip_row.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+
+<HorizontalScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:scrollbars="none">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:id="@+id/search_chip_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/search_chip_group_margin"
+            android:layout_marginEnd="@dimen/search_chip_group_margin"/>
+    </FrameLayout>
+</HorizontalScrollView>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/sort_list_item.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/sort_list_item.xml
new file mode 100644
index 000000000..c2f50c8b8
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/sort_list_item.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                 android:id="@android:id/text1"
+                 android:layout_width="match_parent"
+                 android:layout_height="?android:attr/listPreferredItemHeightSmall"
+                 android:textAppearance="@style/SortList"
+                 android:gravity="center_vertical"
+                 android:checkMark="@drawable/list_checker"
+                 android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                 android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/layout/table_key_value_row.xml b/res/flag(!com.android.documentsui.flags.use_material3)/layout/table_key_value_row.xml
new file mode 100644
index 000000000..6a0b4be13
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/layout/table_key_value_row.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2017 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.
+-->
+<com.android.documentsui.inspector.KeyValueRow
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingStart="30dp"
+    android:paddingEnd="30dp">
+
+    <TextView
+        android:id="@+id/table_row_key"
+        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:paddingTop="13dp"
+        android:paddingBottom="13dp"
+        android:paddingEnd="5dp"
+        android:textAlignment="viewStart"
+        android:textAppearance="?attr/textAppearanceSubtitle1">
+    </TextView>
+
+    <TextView
+        android:id="@+id/table_row_value"
+        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:paddingTop="13dp"
+        android:paddingBottom="13dp"
+        android:clickable="false"
+        android:textIsSelectable="true"
+        android:textAlignment="viewStart"
+        android:textAppearance="@style/InspectorKeySubTitle">
+    </TextView>
+
+</com.android.documentsui.inspector.KeyValueRow>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-h600dp-v31/dimens.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-h600dp-v31/dimens.xml
new file mode 100644
index 000000000..6da529151
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-h600dp-v31/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+<resources>
+    <dimen name="item_doc_inflated_message_padding_top">30dp</dimen>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-h600dp/dimens.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-h600dp/dimens.xml
new file mode 100644
index 000000000..d21465289
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-h600dp/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+<resources>
+    <dimen name="item_doc_inflated_message_padding_top">100dp</dimen>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-night-v31/colors.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-night-v31/colors.xml
new file mode 100644
index 000000000..c5e4f6d90
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-night-v31/colors.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?><!-- 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.
+-->
+
+<resources>
+  <color name="tab_selected_text_color">@android:color/black</color>
+  <color name="work_profile_button_stroke_color">
+    @*android:color/system_accent1_200
+  </color> <!-- accent 200 -->
+  <color name="empty_state_text_color">@*android:color/system_neutral1_100
+  </color>
+  <!-- neutral 100 -->
+  <color name="empty_state_message_text_color">
+    @*android:color/system_neutral2_200
+  </color>
+  <!-- neutral variant 200 -->
+  <color name="tab_unselected_text_color">@*android:color/system_neutral2_200
+  </color>
+  <!-- neutral variant 200 -->
+  <color name="profile_tab_default_color">@*android:color/system_neutral1_800
+  </color>
+  <!-- neutral 800 -->
+  <color name="profile_tab_selected_color">@*android:color/system_neutral2_100
+  </color>
+  <!-- neutral variant 100 -->
+  <color name="fragment_pick_inactive_button_color">
+    @*android:color/system_neutral1_800
+  </color>
+  <!-- neutral 100 -->
+  <color name="fragment_pick_inactive_text_color">
+    @*android:color/system_neutral1_600
+  </color>
+  <!-- neutral 600 -->
+  <color name="fragment_pick_active_button_color">
+    @*android:color/system_neutral2_100
+  </color>
+  <!-- neutral variant 100 -->
+  <color name="fragment_pick_active_text_color">@android:color/black</color>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-night-v31/styles.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-night-v31/styles.xml
new file mode 100644
index 000000000..0bbda8997
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-night-v31/styles.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<resources>
+    <!--
+    <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon">
+        <item name="android:actionMenuTextColor">@*android:color/accent_device_default_dark</item>
+    </style>
+    -->
+
+    <style name="TabTextAppearance" parent="@android:style/TextAppearance.Material.Medium">
+        <item name="android:textSize">14sp</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+        <item name="android:textColor">?android:attr/colorAccent</item>
+    </style>
+
+    <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:backgroundTint">@android:color/transparent</item>
+        <item name="android:textColor">@*android:color/system_neutral1_100</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>
+    </style>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-night/colors.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-night/colors.xml
new file mode 100644
index 000000000..9874d8a4c
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-night/colors.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+<resources>
+    <color name="app_background_color">#202124</color>
+    <color name="background_floating">#3C4043</color>
+    <color name="nav_bar_translucent">#52000000</color>
+
+    <color name="primary">#8AB4F8</color>
+    <color name="secondary">#3D8AB4F8</color>
+    <color name="hairline">#5F6368</color>
+
+    <color name="empty_state_text_color">@android:color/white</color>
+    <color name="error_image_color">@android:color/white</color>
+
+    <color name="edge_effect">@android:color/white</color>
+
+    <!-- AppCompat.textColorSecondary -->
+    <color name="doc_list_item_subtitle_enabled">#b3ffffff</color>
+    <color name="doc_list_item_subtitle_disabled">#36ffffff</color>
+
+    <color name="list_divider_color">#9aa0a6</color>
+    <color name="list_item_selected_background_color">?android:colorSecondary</color>
+
+    <color name="fragment_pick_active_text_color">#202124</color> <!-- Grey 900 -->
+
+    <color name="search_chip_text_selected_color">@android:color/black</color>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-night/themes.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-night/themes.xml
new file mode 100644
index 000000000..8ade73172
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-night/themes.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="LauncherTheme" parent="DocumentsTheme">
+        <item name="android:windowBackground">@drawable/launcher_screen_night</item>
+    </style>
+    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
+
+        <!-- Toolbar -->
+        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
+        <item name="android:actionBarSize">@dimen/action_bar_size</item>
+
+        <!-- Color section -->
+        <item name="android:colorAccent">@color/primary</item>
+        <item name="android:colorBackground">@color/app_background_color</item>
+        <item name="android:colorBackgroundFloating">@color/background_floating</item>
+        <item name="android:colorControlHighlight">@color/ripple_material_dark</item>
+        <item name="android:colorControlActivated">@color/primary</item>
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorSecondary">@color/secondary</item>
+        <item name="android:strokeColor">@color/hairline</item>
+
+        <!-- System | Widget section -->
+        <item name="android:listDivider">@drawable/list_divider</item>
+        <item name="android:statusBarColor">?android:attr/colorBackground</item>
+        <item name="android:windowBackground">?android:attr/colorBackground</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
+
+    </style>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-sw600dp/dimens.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-sw600dp/dimens.xml
new file mode 100644
index 000000000..642ff7e9a
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-sw600dp/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<resources>
+    <dimen name="root_icon_margin">8dp</dimen>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-sw720dp/colors.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-sw720dp/colors.xml
new file mode 100644
index 000000000..b39b89409
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-sw720dp/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<resources>
+    <color name="menu_search_background">#ff2852ab</color>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-sw720dp/dimens.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-sw720dp/dimens.xml
new file mode 100644
index 000000000..85c370ab9
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-sw720dp/dimens.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<resources>
+    <dimen name="grid_padding_horiz">16dp</dimen>
+    <dimen name="grid_padding_vert">16dp</dimen>
+
+    <dimen name="list_item_padding">24dp</dimen>
+    <dimen name="list_item_width">80dp</dimen>
+
+    <dimen name="max_drawer_width">320dp</dimen>
+
+    <dimen name="search_bar_background_margin_start">120dp</dimen>
+    <dimen name="search_bar_background_margin_end">120dp</dimen>
+    <dimen name="search_bar_text_margin_start">55dp</dimen>
+    <dimen name="search_bar_text_margin_end">24dp</dimen>
+    <dimen name="search_bar_icon_padding">16dp</dimen>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/colors.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/colors.xml
new file mode 100644
index 000000000..72de6e574
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/colors.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?><!-- 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.
+-->
+
+<resources>
+  <color name="tab_selected_text_color">@*android:color/system_neutral1_900
+  </color>
+  <!-- neutral 900 -->
+  <color name="tab_unselected_text_color">@*android:color/system_neutral2_700
+  </color>
+  <!-- neutral variant 700-->
+  <color name="work_profile_button_stroke_color">
+    @*android:color/system_accent1_600
+  </color> <!-- primary 600 -->
+  <color name="empty_state_text_color">@*android:color/system_neutral1_900
+  </color>
+  <!-- neutral 900 -->
+  <color name="empty_state_message_text_color">
+    @*android:color/system_neutral2_700
+  </color>
+  <!-- neutral variant 700 -->
+  <color name="profile_tab_selected_color">@*android:color/system_accent1_100
+  </color>
+  <!-- accent 100 -->
+  <color name="profile_tab_default_color">@*android:color/system_neutral1_10
+  </color>
+  <!-- neutral 10 -->
+  <color name="fragment_pick_inactive_button_color">
+    @*android:color/system_neutral1_100
+  </color>
+  <!-- neutral 100 -->
+  <color name="fragment_pick_inactive_text_color">
+    @*android:color/system_neutral1_400
+  </color>
+  <!-- neutral 400 -->
+  <color name="fragment_pick_active_button_color">@*android:color/system_accent1_600
+  </color>
+  <!-- accent 600 -->
+  <color name="fragment_pick_active_text_color">@android:color/white</color>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/dimens.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/dimens.xml
new file mode 100644
index 000000000..a4e39319a
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/dimens.xml
@@ -0,0 +1,29 @@
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+<resources>
+    <dimen name="action_bar_elevation">0dp</dimen>
+    <dimen name="action_bar_margin">0dp</dimen>
+    <dimen name="button_corner_radius">20dp</dimen>
+    <dimen name="tab_selector_indicator_height">0dp</dimen>
+    <dimen name="tab_height">48dp</dimen>
+    <dimen name="tab_container_height">48dp</dimen>
+    <dimen name="profile_tab_padding">20dp</dimen>
+    <dimen name="profile_tab_margin_top">16dp</dimen>
+    <dimen name="profile_tab_margin_side">4dp</dimen>
+    <dimen name="cross_profile_button_corner_radius">30dp</dimen>
+    <dimen name="cross_profile_button_stroke_width">1dp</dimen>
+    <dimen name="cross_profile_button_message_margin_top">16dp</dimen>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles.xml
new file mode 100644
index 000000000..c82ff5814
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<resources>
+
+  <style name="SectionHeader" parent="@android:style/TextAppearance.Material.Medium">
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
+    <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    <item name="android:textSize">12sp</item>
+  </style>
+
+  <!--
+  <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon">
+    <item name="android:actionMenuTextColor">
+      @*android:color/accent_device_default_light
+    </item>
+  </style>
+  -->
+
+  <style name="MaterialButton" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">
+    <item name="android:textAppearance">@style/MaterialButtonTextAppearance
+    </item>
+    <item name="android:backgroundTint">?android:colorAccent</item>
+  </style>
+
+  <style name="MaterialOutlinedButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
+    <item name="android:textAppearance">@style/MaterialButtonTextAppearance
+    </item>
+    <item name="android:backgroundTint">@android:color/white</item>
+    <item name="android:textColor">?android:colorAccent</item>
+  </style>
+
+  <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
+    <item name="android:backgroundTint">@android:color/transparent</item>
+    <item name="android:textColor">@*android:color/system_neutral1_900</item>
+    <item name="android:textAllCaps">false</item>
+    <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance
+    </item>
+  </style>
+
+  <style name="DialogTextButton" parent="@style/Widget.MaterialComponents.Button.TextButton.Dialog">
+    <item name="android:textAppearance">@style/MaterialButtonTextAppearance
+    </item>
+    <item name="android:textColor">?android:attr/colorAccent</item>
+    <item name="android:backgroundTint">@android:color/transparent</item>
+  </style>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles_text.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles_text.xml
new file mode 100644
index 000000000..02b91247b
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values-v31/styles_text.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+<resources>
+    <style name="EmptyStateTitleText">
+        <item name="android:textColor">@color/empty_state_text_color</item>
+        <item name="android:textSize">18sp</item>
+        <item name="fontFamily">@string/config_headerFontFamily</item>
+    </style>
+
+    <style name="EmptyStateMessageText">
+        <item name="android:textColor">@color/empty_state_message_text_color</item>
+        <item name="android:textSize">14sp</item>
+        <item name="fontFamily">@string/config_fontFamily</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values/colors.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values/colors.xml
new file mode 100644
index 000000000..6ccaa6faf
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values/colors.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?><!-- 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.
+-->
+
+<resources>
+  <!-- This is the window background, but also the background for anything
+       else that needs to manually declare a background matching the "default"
+       app background (e.g. the drawer overlay). -->
+
+  <color name="app_background_color">@android:color/white</color>
+  <color name="background_floating">@android:color/white</color>
+  <color name="nav_bar_translucent">#99FFFFFF</color>
+
+  <color name="primary">#1E88E5</color> <!-- Blue 600 -->
+  <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
+  <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
+
+  <color name="chip_background_disable_color">#fff1f3f4</color>
+  <color name="menu_search_background">@android:color/transparent</color>
+  <color name="item_breadcrumb_background_hovered">#1affffff</color>
+  <color name="item_drag_shadow_background">@android:color/white</color>
+  <color name="item_drag_shadow_container_background">
+    @android:color/transparent
+  </color>
+  <color name="tool_bar_gradient_max">#7f000000</color>
+
+  <color name="band_select_background">#88ffffff</color>
+  <color name="band_select_border">#44000000</color>
+
+  <color name="downloads_icon_background">#ff4688f2</color>
+  <color name="app_icon_background">#ff4688f2</color>
+  <color name="shortcut_foreground">#ff3367d6</color>
+  <color name="shortcut_background">#fff5f5f5</color>
+
+  <color name="empty_state_text_color">#202124</color>
+  <color name="error_image_color">#757575</color>
+
+  <color name="edge_effect">@android:color/black</color>
+
+  <color name="doc_list_item_subtitle_enabled">#5F6368</color> <!-- Gray 700 -->
+  <color name="doc_list_item_subtitle_disabled">#613c4043
+  </color> <!-- 38% Grey800 -->
+
+  <color name="list_divider_color">#1f000000</color>
+  <color name="list_item_selected_background_color">?android:colorSecondary
+  </color>
+  <color name="color_surface_header">@color/app_background_color</color>
+
+  <color name="tab_selected_text_color">@color/primary</color>
+  <color name="work_profile_button_stroke_color">@color/primary</color>
+  <color name="profile_tab_selected_color">?android:attr/colorAccent</color>
+  <color name="profile_tab_default_color">#E0E0E0</color>
+  <color name="tab_unselected_text_color">#5F6368</color> <!-- Gray 700 -->
+
+  <color name="fragment_pick_inactive_button_color">#E0E0E0</color>
+  <color name="fragment_pick_inactive_text_color">#5F6368</color>
+  <color name="fragment_pick_active_button_color">@color/primary</color>
+  <color name="fragment_pick_active_text_color">@android:color/white</color>
+
+  <color name="search_chip_text_selected_color">@android:color/white</color>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values/dimens.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values/dimens.xml
new file mode 100644
index 000000000..037375385
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values/dimens.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<resources>
+    <!-- Material design rounded radius -->
+    <dimen name="material_round_radius">2dp</dimen>
+
+    <dimen name="tab_selector_indicator_height">2dp</dimen>
+    <dimen name="profile_tab_padding">0dp</dimen>
+    <dimen name="grid_container_padding">20dp</dimen>
+    <dimen name="list_container_padding">0dp</dimen>
+    <dimen name="icon_size">40dp</dimen>
+    <dimen name="button_touch_size">48dp</dimen>
+    <dimen name="root_icon_size">24dp</dimen>
+    <dimen name="root_icon_margin">0dp</dimen>
+    <dimen name="root_spacer_padding">0dp</dimen>
+    <dimen name="root_action_icon_size">18dp</dimen>
+    <dimen name="root_icon_disabled_alpha">?android:attr/disabledAlpha</dimen>
+    <dimen name="check_icon_size">30dp</dimen>
+    <dimen name="zoom_icon_size">24dp</dimen>
+    <dimen name="list_item_thumbnail_size">40dp</dimen>
+    <dimen name="grid_item_icon_size">30dp</dimen>
+    <dimen name="progress_bar_height">4dp</dimen>
+    <fraction name="grid_scale_min">85%</fraction>
+    <fraction name="grid_scale_max">200%</fraction>
+    <dimen name="grid_width">152dp</dimen>
+    <dimen name="grid_section_separator_height">0dp</dimen>
+    <dimen name="grid_item_margin">6dp</dimen>
+    <dimen name="grid_padding_horiz">4dp</dimen>
+    <dimen name="grid_padding_vert">4dp</dimen>
+    <dimen name="list_item_width">72dp</dimen>
+    <dimen name="list_item_height">72dp</dimen>
+    <dimen name="list_item_padding">16dp</dimen>
+    <dimen name="list_item_icon_padding">16dp</dimen>
+    <dimen name="breadcrumb_item_padding">8dp</dimen>
+    <dimen name="breadcrumb_item_height">36dp</dimen>
+    <dimen name="list_divider_inset">72dp</dimen>
+    <dimen name="dir_elevation">8dp</dimen>
+    <dimen name="drag_shadow_size">120dp</dimen>
+    <dimen name="grid_item_elevation">2dp</dimen>
+    <dimen name="grid_item_radius">2dp</dimen>
+    <dimen name="max_drawer_width">280dp</dimen>
+    <dimen name="briefcase_icon_margin">8dp</dimen>
+    <dimen name="briefcase_icon_size">14dp</dimen>
+    <dimen name="briefcase_icon_size_photo">24dp</dimen>
+    <dimen name="button_corner_radius">2dp</dimen>
+
+    <dimen name="drawer_edge_width">12dp</dimen>
+
+    <dimen name="drag_shadow_width">176dp</dimen>
+    <dimen name="drag_shadow_height">64dp</dimen>
+    <dimen name="drag_shadow_radius">4dp</dimen>
+    <dimen name="drag_shadow_padding">8dp</dimen>
+
+    <dimen name="doc_header_sort_icon_size">16dp</dimen>
+    <dimen name="doc_header_height">60dp</dimen>
+
+    <dimen name="dropdown_sort_widget_margin">12dp</dimen>
+    <dimen name="dropdown_sort_widget_size">54dp</dimen>
+    <dimen name="dropdown_sort_text_size">18sp</dimen>
+
+    <dimen name="drop_icon_height">14dp</dimen>
+    <dimen name="drop_icon_width">14dp</dimen>
+
+    <dimen name="header_message_horizontal_padding">8dp</dimen>
+
+    <dimen name="fastscroll_default_thickness">8dp</dimen>
+    <dimen name="fastscroll_minimum_range">50dp</dimen>
+    <dimen name="fastscroll_margin">0dp</dimen>
+
+    <dimen name="bottom_bar_height">56dp</dimen>
+    <dimen name="bottom_bar_padding">10dp</dimen>
+    <dimen name="bottom_bar_button_height">36dip</dimen>
+    <dimen name="bottom_bar_button_horizontal_padding">24dp</dimen>
+    <dimen name="bottom_bar_button_corner_radius">4dp</dimen>
+
+    <dimen name="inspector_header_height">280dp</dimen>
+
+    <dimen name="root_info_header_height">60dp</dimen>
+    <dimen name="root_info_header_horizontal_padding">24dp</dimen>
+
+    <dimen name="search_chip_group_margin">20dp</dimen>
+    <dimen name="search_chip_spacing">8dp</dimen>
+    <dimen name="search_chip_half_spacing">4dp</dimen>
+    <dimen name="search_chip_icon_padding">4dp</dimen>
+    <dimen name="search_chip_radius">16dp</dimen>
+
+    <dimen name="dialog_content_padding_top">18dp</dimen>
+    <dimen name="dialog_content_padding_bottom">24dp</dimen>
+
+    <dimen name="apps_row_title_height">48dp</dimen>
+    <dimen name="apps_row_title_padding_start">24dp</dimen>
+    <dimen name="apps_row_item_width">92dp</dimen>
+    <dimen name="apps_row_item_height">82dp</dimen>
+    <dimen name="apps_row_app_icon_size">32dp</dimen>
+    <dimen name="apps_row_app_icon_margin_horizontal">30dp</dimen>
+    <dimen name="apps_row_app_icon_margin_top">6dp</dimen>
+    <dimen name="apps_row_app_icon_margin_bottom">10dp</dimen>
+    <dimen name="apps_row_exit_icon_size">12dp</dimen>
+    <dimen name="apps_row_exit_icon_margin_top">2dp</dimen>
+    <dimen name="apps_row_exit_icon_margin_bottom">6dp</dimen>
+    <dimen name="apps_row_item_text_margin_horizontal">8dp</dimen>
+
+    <dimen name="search_bar_elevation">3dp</dimen>
+    <dimen name="search_bar_radius">8dp</dimen>
+    <dimen name="search_bar_background_margin_start">0dp</dimen>
+    <dimen name="search_bar_background_margin_end">0dp</dimen>
+    <dimen name="search_bar_margin">8dp</dimen>
+    <dimen name="search_bar_text_size">16dp</dimen>
+
+    <dimen name="action_bar_elevation">3dp</dimen>
+    <dimen name="action_bar_margin">1dp</dimen>
+    <dimen name="action_bar_size">48dp</dimen>
+    <dimen name="action_mode_text_size">18sp</dimen>
+
+    <dimen name="refresh_icon_range">64dp</dimen>
+
+    <dimen name="item_doc_inflated_message_padding_top">0dp</dimen>
+    <dimen name="cross_profile_button_corner_radius">0dp</dimen>
+    <dimen name="cross_profile_button_stroke_width">0dp</dimen>
+    <dimen name="cross_profile_button_message_margin_top">4dp</dimen>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values/layouts.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values/layouts.xml
new file mode 100644
index 000000000..a60ce87ba
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values/layouts.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<resources>
+    <item name="documents_activity" type="layout">@layout/drawer_layout</item>
+    <item name="files_activity" type="layout">@layout/drawer_layout</item>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values/styles.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values/styles.xml
new file mode 100644
index 000000000..1efd1d5d1
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values/styles.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="ActionBarThemeCommon" parent="@style/ThemeOverlay.AppCompat.ActionBar">
+        <item name="colorControlNormal">?android:textColorSecondary</item>
+        <!-- Modern platform themes set actionMenuTextColor to textColorPrimary. For example,
+             see Theme.Material in frameworks/base/core/res/res/values/themes_material.xml.
+             However, if the platform theme does not set actionMenuTextColor we are going to
+             crash, so let's set it here. Additionally, most of our ActionBarTheme themes
+             override this -->
+        <item name="android:actionMenuTextColor">?android:textColorPrimary</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+
+    <!-- This gets overridden for specific platform versions and/or configs -->
+    <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon"/>
+
+    <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
+        <!-- attr "height" was used by support lib should not in overlay scope -->
+        <item name="height">@dimen/action_bar_size</item>
+        <item name="titleTextStyle">@style/ActionModeTitle</item>
+        <item name="android:layout_margin">@dimen/search_bar_margin</item>
+    </style>
+
+    <style name="CardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
+        <item name="cardBackgroundColor">@color/app_background_color</item>
+        <item name="cardPreventCornerOverlap">false</item>
+        <item name="cardCornerRadius">@dimen/grid_item_radius</item>
+        <item name="cardElevation">@dimen/grid_item_elevation</item>
+    </style>
+
+    <style name="TrimmedHorizontalProgressBar" parent="android:Widget.Material.ProgressBar.Horizontal">
+        <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_material_trimmed</item>
+        <item name="android:minHeight">3dp</item>
+        <item name="android:maxHeight">3dp</item>
+    </style>
+
+    <style name="SnackbarButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
+        <item name="android:textColor">?android:colorPrimary</item>
+    </style>
+
+    <style name="AutoCompleteTextViewStyle" parent="@style/Widget.AppCompat.AutoCompleteTextView">
+        <item name="android:textColorHint">?android:attr/textColorSecondary</item>
+        <item name="android:textAppearance">@style/AutoCompleteText</item>
+    </style>
+
+    <style name="BottomSheetDialogStyle" parent="@style/ThemeOverlay.MaterialComponents.BottomSheetDialog">
+        <item name="android:windowIsFloating">false</item>
+        <item name="bottomSheetStyle">@style/BottomSheet</item>
+        <item name="colorControlHighlight">@color/ripple_material_light</item>
+    </style>
+
+    <style name="BottomSheet" parent="@style/Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@drawable/bottom_sheet_dialog_background</item>
+    </style>
+
+    <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">?android:colorControlNormal</item>
+        <item name="android:minWidth">@dimen/button_touch_size</item>
+    </style>
+
+    <style name="OverflowMenuStyle" parent="@style/Widget.AppCompat.PopupMenu.Overflow">
+        <item name="android:popupBackground">@drawable/menu_dropdown_panel</item>
+        <item name="android:dropDownWidth">wrap_content</item>
+        <item name="android:overlapAnchor">false</item>
+    </style>
+
+    <style name="MaterialAlertDialogTitleStyle" parent="@style/MaterialAlertDialog.MaterialComponents.Title.Text.CenterStacked">
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:textSize">20sp</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+    
+    <style name="MaterialButton" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">
+        <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>
+    </style>
+
+    <style name="MaterialOutlinedButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>
+    </style>
+
+    <style name="DialogTextButton" parent="@style/Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>
+        <item name="android:textColor">?android:attr/colorAccent</item>
+    </style>
+
+    <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>
+    </style>
+
+    <style name="AlertDialogTheme" parent="@style/ThemeOverlay.AppCompat.Dialog.Alert">
+        <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>
+        <item name="buttonBarNegativeButtonStyle">@style/DialogTextButton</item>
+    </style>
+
+    <style name="MaterialAlertDialogStyle" parent="@style/MaterialAlertDialog.MaterialComponents">
+        <item name="backgroundInsetTop">12dp</item>
+        <item name="backgroundInsetBottom">12dp</item>
+    </style>
+
+    <style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog.Centered">
+        <item name="android:dialogCornerRadius">@dimen/grid_item_radius</item>
+        <item name="alertDialogStyle">@style/MaterialAlertDialogStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>
+        <item name="buttonBarNegativeButtonStyle">@style/DialogTextButton</item>
+        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialogTitleStyle</item>
+    </style>
+</resources>
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values/styles_text.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values/styles_text.xml
new file mode 100644
index 000000000..084480c2c
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values/styles_text.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+<resources>
+    <style name="SortTitle" parent="@style/TextAppearance.MaterialComponents.Headline6">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">11sp</item>
+    </style>
+
+    <style name="SectionHeader" parent="@android:style/TextAppearance.Material.Medium">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="SortList" parent="@style/TextAppearance.AppCompat.Subhead">
+        <item name="android:textColor">@color/sort_list_text</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+
+    <style name="SearchBarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textSize">@dimen/search_bar_text_size</item>
+        <item name="fontFamily">@string/config_fontFamily</item>
+    </style>
+
+    <style name="SearchChipText">
+        <item name="android:textSize">14sp</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+
+    <style name="AppsItemText">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">12sp</item>
+        <item name="fontFamily">@string/config_fontFamily</item>
+    </style>
+
+    <style name="AppsItemSubText">
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textSize">11sp</item>
+    </style>
+
+    <style name="AutoCompleteText" parent="@style/TextAppearance.AppCompat.Medium">
+        <item name="fontFamily">@string/config_fontFamily</item>
+    </style>
+
+    <style name="CardPrimaryText" parent="@style/TextAppearance.AppCompat.Subhead">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">14sp</item>
+        <item name="fontFamily">@string/config_fontFamily</item>
+    </style>
+
+    <style name="ActionModeTitle" parent="@style/ToolbarTitle">
+        <item name="android:textSize">@dimen/action_mode_text_size</item>
+    </style>
+
+    <style name="ToolbarTitle" parent="@android:style/TextAppearance.Material.Title">
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+
+    <style name="DrawerMenuTitle" parent="@android:style/TextAppearance.Material.Title">
+        <item name="android:textSize">24sp</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+
+    <style name="DrawerMenuHeader" parent="@android:style/TextAppearance.Material.Subhead">
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">11sp</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+
+    <style name="DrawerMenuPrimary" parent="android:style/TextAppearance.Material.Body2">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/item_root_primary_text</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+
+    <style name="DrawerMenuSecondary" parent="android:style/TextAppearance.Material.Body2">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/item_root_secondary_text</item>
+        <item name="fontFamily">@string/config_fontFamily</item>
+    </style>
+
+    <style name="InspectorKeySubTitle" parent="@style/TextAppearance.MaterialComponents.Subtitle1">
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
+    <style name="MaterialButtonTextAppearance" parent="@style/TextAppearance.MaterialComponents.Button">
+        <item name="android:textAllCaps">@bool/config_button_all_caps</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+
+    <style name="BreadcrumbText" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
+        <item name="android:textColor">@color/horizontal_breadcrumb_color</item>
+        <item name="android:textSize">14sp</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+
+    <style name="EmptyStateTitleText">
+        <item name="android:textColor">@color/empty_state_text_color</item>
+        <item name="android:textSize">14sp</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+
+    <style name="EmptyStateMessageText">
+        <item name="android:textColor">@color/empty_state_text_color</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="EmptyStateButtonTextAppearance">
+        <item name="android:textColor">?android:attr/colorAccent</item>
+        <item name="android:textSize">14sp</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+
+    <style name="TabTextAppearance" parent="@android:style/TextAppearance.Material.Medium">
+        <item name="android:textSize">14sp</item>
+        <item name="fontFamily">@string/config_fontFamilyMedium</item>
+    </style>
+
+    <style name="ItemCaptionText" parent="@android:style/TextAppearance.Material.Caption">
+        <item name="android:textColor">@color/doc_list_item_subtitle_color</item>
+        <item name="fontFamily">@string/config_fontFamily</item>
+    </style>
+
+    <style name="MenuItemTextAppearance" parent="@android:style/TextAppearance.Material.Body2">
+        <item name="android:textSize">14sp</item>
+        <item name="fontFamily">@string/config_fontFamily</item>
+    </style>
+
+    <style name="Subhead" parent="@android:style/TextAppearance.Material.Subhead">
+        <item name="fontFamily">@string/config_fontFamily</item>
+    </style>
+
+    <style name="Body1" parent="@android:style/TextAppearance.Material.Body1">
+        <item name="fontFamily">@string/config_fontFamily</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/res/flag(!com.android.documentsui.flags.use_material3)/values/themes.xml b/res/flag(!com.android.documentsui.flags.use_material3)/values/themes.xml
new file mode 100644
index 000000000..d6e3af0fe
--- /dev/null
+++ b/res/flag(!com.android.documentsui.flags.use_material3)/values/themes.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<resources>
+    <style name="LauncherTheme" parent="DocumentsTheme">
+        <item name="android:windowBackground">@drawable/launcher_screen</item>
+    </style>
+    <!-- DocumentsTheme is allow customize by run time overlay -->
+    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
+
+        <item name="android:actionBarSize">@dimen/action_bar_size</item>
+        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
+
+        <!-- Color section -->
+        <item name="android:colorAccent">@color/primary</item>
+        <item name="android:colorBackground">@android:color/white</item>
+        <item name="android:colorBackgroundFloating">@color/background_floating</item>
+        <item name="android:colorControlHighlight">@color/ripple_material_light</item>
+        <item name="android:colorControlActivated">@color/primary</item>
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorSecondary">@color/secondary</item>
+        <item name="android:strokeColor">@color/hairline</item>
+
+        <!-- System | Widget section -->
+        <item name="android:listDivider">@drawable/list_divider</item>
+        <item name="android:statusBarColor">?android:colorBackground</item>
+        <item name="android:navigationBarColor">?android:colorBackground</item>
+        <item name="android:windowBackground">?android:colorBackground</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
+
+        <!-- OEM should not overlay this attr -->
+        <item name="android:windowNoTitle">true</item>
+
+    </style>
+
+    <style name="DocumentsDefaultTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
+
+        <!-- This only used by support lib, not allow to overlay -->
+        <item name="windowActionBar">false</item>
+        <item name="windowActionModeOverlay">true</item>
+
+        <!-- For material design widget, chips, buttons, not support attr-->
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorAccent">@color/primary</item>
+
+        <!-- TODO need to solve the error handle in GridItemThumbnail -->
+        <item name="gridItemTint">@color/item_doc_grid_tint</item>
+
+        <item name="actionBarTheme">@style/ActionBarTheme</item>
+        <item name="actionModeStyle">@style/ActionModeStyle</item>
+        <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
+        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
+        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
+        <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogStyle</item>
+        <item name="materialButtonStyle">@style/MaterialButton</item>
+        <item name="materialButtonOutlinedStyle">@style/MaterialOutlinedButton</item>
+        <item name="materialCardViewStyle">@style/CardViewStyle</item>
+        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
+        <item name="queryBackground">@color/menu_search_background</item>
+        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
+        <item name="android:itemTextAppearance">@style/MenuItemTextAppearance</item>
+    </style>
+
+    <!-- Theme used for Material 3 uplift, hidden behind the use_material3 flag. -->
+    <style name="DocumentsDefaultM3Theme" parent="@style/Theme.Material3.DynamicColors.DayNight.NoActionBar">
+
+        <!-- This only used by support lib, not allow to overlay -->
+        <item name="windowActionBar">false</item>
+        <item name="windowActionModeOverlay">true</item>
+
+        <!-- For material design widget, chips, buttons, not support attr-->
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorAccent">@color/primary</item>
+
+        <!-- TODO need to solve the error handle in GridItemThumbnail -->
+        <item name="gridItemTint">@color/item_doc_grid_tint</item>
+
+        <item name="actionBarTheme">@style/ActionBarTheme</item>
+        <item name="actionModeStyle">@style/ActionModeStyle</item>
+        <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
+        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
+        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
+        <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogStyle</item>
+        <item name="materialButtonStyle">@style/MaterialButton</item>
+        <item name="materialButtonOutlinedStyle">@style/MaterialOutlinedButton</item>
+        <item name="materialCardViewStyle">@style/CardViewStyle</item>
+        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
+        <item name="queryBackground">@color/menu_search_background</item>
+        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
+        <item name="android:itemTextAppearance">@style/MenuItemTextAppearance</item>
+    </style>
+
+    <style name="TabTheme" parent="@android:style/Theme.DeviceDefault.DayNight">
+        <item name="colorPrimary">@color/edge_effect</item>
+    </style>
+</resources>
diff --git a/res/layout-sw720dp/column_headers.xml b/res/layout-sw720dp/column_headers.xml
deleted file mode 100644
index 60be5dc10..000000000
--- a/res/layout-sw720dp/column_headers.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2016 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/table_header"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/doc_header_height"
-    android:background="@drawable/sort_widget_background"
-    android:visibility="gone">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:baselineAligned="false"
-        android:gravity="center_vertical"
-        android:minHeight="@dimen/list_item_height"
-        android:paddingStart="@dimen/list_item_padding"
-        android:paddingEnd="@dimen/list_item_width"
-        android:orientation="horizontal">
-        <!-- Placeholder for icon -->
-        <View
-            android:layout_width="@dimen/list_item_thumbnail_size"
-            android:layout_height="@dimen/list_item_thumbnail_size"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="16dp"
-            android:layout_marginStart="0dp"/>
-
-        <!-- Column headers -->
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="horizontal">
-
-            <com.android.documentsui.sorting.HeaderCell
-                android:id="@android:id/title"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.4"
-                android:layout_marginEnd="12dp"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:animateLayoutChanges="true">
-
-                <include layout="@layout/shared_cell_content" />
-            </com.android.documentsui.sorting.HeaderCell>
-
-            <com.android.documentsui.sorting.HeaderCell
-                android:id="@android:id/summary"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0"
-                android:layout_marginEnd="0dp"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:animateLayoutChanges="true">
-
-                <include layout="@layout/shared_cell_content" />
-            </com.android.documentsui.sorting.HeaderCell>
-
-            <com.android.documentsui.sorting.HeaderCell
-                android:id="@+id/file_type"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:layout_marginEnd="12dp"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:animateLayoutChanges="true">
-
-                <include layout="@layout/shared_cell_content" />
-            </com.android.documentsui.sorting.HeaderCell>
-
-            <com.android.documentsui.sorting.HeaderCell
-                android:id="@+id/size"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:layout_marginEnd="12dp"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:animateLayoutChanges="true">
-
-                <include layout="@layout/shared_cell_content" />
-            </com.android.documentsui.sorting.HeaderCell>
-
-            <com.android.documentsui.sorting.HeaderCell
-                android:id="@+id/date"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:layout_marginEnd="12dp"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:animateLayoutChanges="true">
-
-                <include layout="@layout/shared_cell_content" />
-            </com.android.documentsui.sorting.HeaderCell>
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw720dp/directory_app_bar.xml b/res/layout-sw720dp/directory_app_bar.xml
deleted file mode 100644
index 928659793..000000000
--- a/res/layout-sw720dp/directory_app_bar.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-
-<com.google.android.material.appbar.AppBarLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/app_bar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/colorBackground">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:layout_margin="@dimen/search_bar_margin"
-        android:background="?android:attr/colorBackground"
-        android:theme="?actionBarTheme"
-        android:popupTheme="?actionBarPopupTheme"
-        android:elevation="3dp"
-        app:collapseContentDescription="@string/button_back"
-        app:titleTextAppearance="@style/ToolbarTitle"
-        app:layout_collapseMode="pin">
-
-        <TextView
-            android:id="@+id/searchbar_title"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
-            android:layout_marginStart="@dimen/search_bar_text_margin_start"
-            android:layout_marginEnd="@dimen/search_bar_text_margin_end"
-            android:paddingStart="@dimen/search_bar_icon_padding"
-            android:gravity="center_vertical"
-            android:text="@string/search_bar_hint"
-            android:textAppearance="@style/SearchBarTitle"
-            android:drawableStart="@drawable/ic_menu_search"
-            android:drawablePadding="@dimen/search_bar_icon_padding"/>
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <include layout="@layout/directory_header"/>
-
-</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/res/layout-sw720dp/item_doc_list.xml b/res/layout-sw720dp/item_doc_list.xml
deleted file mode 100644
index 01cdd8c66..000000000
--- a/res/layout-sw720dp/item_doc_list.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/list_item_background"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:orientation="horizontal" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:baselineAligned="false"
-        android:gravity="center_vertical"
-        android:minHeight="@dimen/list_item_height"
-        android:orientation="horizontal" >
-
-        <FrameLayout
-            android:id="@+id/icon"
-            android:pointerIcon="hand"
-            android:layout_width="@dimen/list_item_width"
-            android:layout_height="@dimen/list_item_height"
-            android:paddingBottom="@dimen/list_item_icon_padding"
-            android:paddingTop="@dimen/list_item_icon_padding"
-            android:paddingEnd="16dp"
-            android:paddingStart="@dimen/list_item_padding" >
-
-            <com.google.android.material.card.MaterialCardView
-                app:cardElevation="0dp"
-                app:cardBackgroundColor="@android:color/transparent"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <ImageView
-                    android:id="@+id/icon_mime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:contentDescription="@null"
-                    android:scaleType="centerInside" />
-
-                <ImageView
-                    android:id="@+id/icon_thumb"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:contentDescription="@null"
-                    android:scaleType="centerCrop" />
-
-                <ImageView
-                    android:id="@+id/icon_check"
-                    android:layout_width="@dimen/check_icon_size"
-                    android:layout_height="@dimen/check_icon_size"
-                    android:layout_gravity="center"
-                    android:alpha="0"
-                    android:contentDescription="@null"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/ic_check_circle" />
-
-            </com.google.android.material.card.MaterialCardView>
-
-        </FrameLayout>
-
-        <!-- This is the one special case where we want baseline alignment! -->
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="horizontal" >
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.4"
-                android:layout_marginEnd="12dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/icon_profile_badge"
-                    android:layout_height="@dimen/briefcase_icon_size"
-                    android:layout_width="@dimen/briefcase_icon_size"
-                    android:layout_marginEnd="@dimen/briefcase_icon_margin"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/ic_briefcase"
-                    android:tint="?android:attr/colorAccent"
-                    android:contentDescription="@string/a11y_work"/>
-
-                <TextView
-                    android:id="@android:id/title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="middle"
-                    android:singleLine="true"
-                    android:textAlignment="viewStart"
-                    android:textAppearance="@style/Subhead"
-                    android:textColor="?android:attr/textColorPrimary"/>
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/file_type"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="12dp"
-                android:layout_weight="0.2"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textAlignment="viewStart"
-                android:textAppearance="@style/Body1"
-                android:textColor="?android:attr/textColorSecondary" />
-
-            <TextView
-                android:id="@+id/size"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="12dp"
-                android:layout_weight="0.2"
-                android:ellipsize="end"
-                android:minWidth="70dp"
-                android:singleLine="true"
-                android:textAlignment="viewEnd"
-                android:textAppearance="@style/Body1"
-                android:textColor="?android:attr/textColorSecondary" />
-
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="12dp"
-                android:layout_weight="0.2"
-                android:ellipsize="end"
-                android:minWidth="70dp"
-                android:singleLine="true"
-                android:textAlignment="viewEnd"
-                android:textAppearance="@style/Body1"
-                android:textColor="?android:attr/textColorSecondary" />
-        </LinearLayout>
-
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-            <FrameLayout
-                android:id="@+id/preview_icon"
-                android:layout_width="@dimen/list_item_width"
-                android:layout_height="@dimen/list_item_height"
-                android:padding="@dimen/list_item_icon_padding"
-                android:focusable="true">
-
-                <ImageView
-                    android:layout_width="@dimen/check_icon_size"
-                    android:layout_height="@dimen/check_icon_size"
-                    android:layout_gravity="center"
-                    android:scaleType="fitCenter"
-                    android:tint="?android:attr/textColorPrimary"
-                    android:src="@drawable/ic_zoom_out"/>
-
-            </FrameLayout>
-
-            <android.widget.Space
-                android:layout_width="@dimen/list_item_width"
-                android:layout_height="@dimen/list_item_height"/>
-
-        </FrameLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw720dp/shared_cell_content.xml b/res/layout-sw720dp/shared_cell_content.xml
deleted file mode 100644
index 9346933fd..000000000
--- a/res/layout-sw720dp/shared_cell_content.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2016 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.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView
-        android:id="@+id/label"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAlignment="viewStart"
-        android:textAppearance="@style/Subhead"
-        android:textColor="?android:attr/textColorSecondary"/>
-
-    <ImageView
-        android:id="@+id/sort_arrow"
-        android:layout_height="@dimen/doc_header_sort_icon_size"
-        android:layout_width="@dimen/doc_header_sort_icon_size"
-        android:layout_marginStart="3dp"
-        android:visibility="gone"
-        android:src="@drawable/ic_sort_arrow"
-        android:contentDescription="@null"/>
-</merge>
\ No newline at end of file
diff --git a/res/layout/apps_item.xml b/res/layout/apps_item.xml
deleted file mode 100644
index 61241f761..000000000
--- a/res/layout/apps_item.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:minWidth="@dimen/apps_row_item_width"
-    android:paddingBottom="@dimen/apps_row_exit_icon_margin_bottom"
-    android:orientation="vertical"
-    android:background="@drawable/generic_ripple_background"
-    android:gravity="center_horizontal">
-
-    <ImageView
-        android:id="@+id/app_icon"
-        android:layout_width="@dimen/apps_row_app_icon_size"
-        android:layout_height="@dimen/apps_row_app_icon_size"
-        android:layout_marginTop="@dimen/apps_row_app_icon_margin_top"
-        android:layout_marginBottom="@dimen/apps_row_app_icon_margin_bottom"
-        android:layout_marginStart="@dimen/apps_row_app_icon_margin_horizontal"
-        android:layout_marginEnd="@dimen/apps_row_app_icon_margin_horizontal"/>
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/apps_row_item_text_margin_horizontal"
-        android:layout_marginEnd="@dimen/apps_row_item_text_margin_horizontal"
-        android:textAppearance="@style/AppsItemText"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:gravity="center"/>
-
-    <TextView
-        android:id="@+id/summary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/apps_row_item_text_margin_horizontal"
-        android:layout_marginEnd="@dimen/apps_row_item_text_margin_horizontal"
-        android:textAppearance="@style/AppsItemSubText"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:gravity="center"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/apps_row.xml b/res/layout/apps_row.xml
deleted file mode 100644
index 0b8504a9a..000000000
--- a/res/layout/apps_row.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/apps_row"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/apps_row_title_height"
-        android:paddingStart="@dimen/apps_row_title_padding_start"
-        android:textAppearance="@style/SortTitle"
-        android:text="@string/apps_row_title"
-        android:textAllCaps="true"
-        android:gravity="center"/>
-
-    <HorizontalScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fillViewport="true"
-        android:scrollbars="none">
-        <LinearLayout
-            android:id="@+id/apps_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"/>
-    </HorizontalScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/column_headers.xml b/res/layout/column_headers.xml
deleted file mode 100644
index bee221203..000000000
--- a/res/layout/column_headers.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2016 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.
--->
-
-<!-- A placeholder of table header on small screens. This won't inflate any view when it's included
-     into other layouts. -->
-<merge />
diff --git a/res/layout/dialog_delete_confirmation.xml b/res/layout/dialog_delete_confirmation.xml
deleted file mode 100644
index 80879ad00..000000000
--- a/res/layout/dialog_delete_confirmation.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="24dp"
-    android:paddingStart="24dp"
-    android:paddingEnd="24dp"
-    android:textAppearance="@style/Subhead">
-</TextView>
diff --git a/res/layout/dialog_file_name.xml b/res/layout/dialog_file_name.xml
deleted file mode 100644
index 7f2a9592b..000000000
--- a/res/layout/dialog_file_name.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:fitsSystemWindows="true">
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/input_wrapper"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:layout_marginTop="@dimen/dialog_content_padding_top"
-        android:layout_marginBottom="@dimen/dialog_content_padding_bottom"
-        android:layout_centerInParent="true"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@android:id/text1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLength="255"
-            android:inputType="textCapSentences"/>
-
-    </com.google.android.material.textfield.TextInputLayout>
-</FrameLayout>
diff --git a/res/layout/dialog_sorting.xml b/res/layout/dialog_sorting.xml
deleted file mode 100644
index d8cb7364c..000000000
--- a/res/layout/dialog_sorting.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:paddingTop="?android:attr/listPreferredItemPaddingStart"
-        android:paddingBottom="?android:attr/listPreferredItemPaddingStart"
-        android:textAllCaps="true"
-        android:text="@string/sort_dimension_dialog_title"
-        android:textAppearance="@style/SortTitle"/>
-
-    <ListView
-        android:id="@+id/sorting_dialog_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-</LinearLayout>
diff --git a/res/layout/directory_app_bar.xml b/res/layout/directory_app_bar.xml
deleted file mode 100644
index ad80ec201..000000000
--- a/res/layout/directory_app_bar.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-
-<com.google.android.material.appbar.AppBarLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/app_bar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/colorBackground">
-
-    <com.google.android.material.appbar.CollapsingToolbarLayout
-        android:id="@+id/collapsing_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="3dp"
-        app:titleEnabled="false"
-        app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed">
-
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/directory_header" />
-
-        </androidx.core.widget.NestedScrollView>
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
-            android:layout_margin="@dimen/search_bar_margin"
-            android:background="?android:attr/colorBackground"
-            android:theme="?actionBarTheme"
-            android:popupTheme="?actionBarPopupTheme"
-            android:elevation="@dimen/search_bar_elevation"
-            app:collapseContentDescription="@string/button_back"
-            app:titleTextAppearance="@style/ToolbarTitle"
-            app:layout_collapseMode="pin">
-
-            <TextView
-                android:id="@+id/searchbar_title"
-                android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
-                android:gravity="center_vertical"
-                android:text="@string/search_bar_hint"
-                android:textAppearance="@style/SearchBarTitle" />
-
-        </androidx.appcompat.widget.Toolbar>
-
-    </com.google.android.material.appbar.CollapsingToolbarLayout>
-
-</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/res/layout/directory_header.xml b/res/layout/directory_header.xml
deleted file mode 100644
index af730829f..000000000
--- a/res/layout/directory_header.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/directory_header"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <com.android.documentsui.HorizontalBreadcrumb
-        android:id="@+id/horizontal_breadcrumb"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?android:attr/colorBackground"/>
-
-    <!-- used for search chip. -->
-    <include layout="@layout/search_chip_row"/>
-
-    <LinearLayout
-        android:id="@+id/tabs_container"
-        android:theme="@style/TabTheme"
-        android:clipToPadding="true"
-        android:clipChildren="true"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="@dimen/profile_tab_padding"
-        android:paddingRight="@dimen/profile_tab_padding"
-        android:orientation="vertical">
-
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/tabs"
-            android:background="@android:color/transparent"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:tabMaxWidth="0dp"
-            app:tabGravity="fill"
-            app:tabMode="fixed"
-            app:tabIndicatorColor="?android:attr/colorAccent"
-            app:tabIndicatorHeight="@dimen/tab_selector_indicator_height"
-            app:tabSelectedTextColor="@color/tab_selected_text_color"
-            app:tabTextAppearance="@style/TabTextAppearance"
-            app:tabTextColor="@color/tab_unselected_text_color"/>
-        <View
-            android:id="@+id/tab_separator"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?android:attr/listDivider"/>
-    </LinearLayout>
-
-    <!-- used for apps row. -->
-    <include layout="@layout/apps_row"/>
-
-    <LinearLayout
-        android:id="@+id/header_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/root_info_header_horizontal_padding"
-        android:layout_marginEnd="@dimen/root_info_header_horizontal_padding"
-        android:minHeight="@dimen/root_info_header_height"
-        android:accessibilityHeading="true">
-
-        <TextView
-            android:id="@+id/header_title"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:textAppearance="@style/SectionHeader"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:gravity="start|center_vertical"/>
-
-        <androidx.appcompat.widget.ActionMenuView
-            android:id="@+id/sub_menu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|center_vertical"/>
-
-    </LinearLayout>
-
-    <!-- column headers are empty on small screens, in portrait or in grid mode. -->
-    <include layout="@layout/column_headers"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/drag_shadow_layout.xml b/res/layout/drag_shadow_layout.xml
deleted file mode 100644
index 591e81375..000000000
--- a/res/layout/drag_shadow_layout.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<!-- Transparent container so shadow layer can be drawn -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="8dp"
-    android:background="@color/item_drag_shadow_container_background">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:background="@drawable/drag_shadow_background">
-
-        <include layout="@layout/drop_badge"/>
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:textAlignment="viewStart"
-            android:textAppearance="@style/Subhead"
-            android:paddingStart="6dp"
-            android:paddingBottom="1dp"/>
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml
deleted file mode 100644
index d08c17d9f..000000000
--- a/res/layout/drawer_layout.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<!-- CoordinatorLayout is necessary for various components (e.g. Snackbars, and
-     floating action buttons) to operate correctly. -->
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/coordinator_layout">
-
-    <androidx.drawerlayout.widget.DrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/scrolling_behavior">
-
-                <FrameLayout
-                    android:id="@+id/container_directory"
-                    android:clipToPadding="false"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1" />
-
-                <FrameLayout
-                    android:id="@+id/container_search_fragment"
-                    android:clipToPadding="false"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
-
-                <!-- Drawer edge is a placeholder view used to capture hovering
-                     event on view edge to open the drawer. (b/28345294) -->
-                <View
-                    android:id="@+id/drawer_edge"
-                    android:background="@android:color/transparent"
-                    android:layout_width="@dimen/drawer_edge_width"
-                    android:layout_height="match_parent"/>
-            </FrameLayout>
-
-            <androidx.coordinatorlayout.widget.CoordinatorLayout
-                android:id="@+id/container_save"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|center_horizontal"
-                android:background="?android:attr/colorBackgroundFloating"
-                android:elevation="8dp" />
-
-            <include layout="@layout/directory_app_bar"/>
-
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-        <LinearLayout
-            android:id="@+id/drawer_roots"
-            android:layout_width="256dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="start"
-            android:orientation="vertical"
-            android:elevation="0dp"
-            android:background="?android:attr/colorBackground">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/roots_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
-                android:elevation="0dp"
-                app:titleTextAppearance="@style/DrawerMenuTitle"
-                app:titleTextColor="?android:colorAccent"/>
-
-            <FrameLayout
-                android:id="@+id/container_roots"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-
-        </LinearLayout>
-
-    </androidx.drawerlayout.widget.DrawerLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/layout/drop_badge.xml b/res/layout/drop_badge.xml
deleted file mode 100644
index e17fa1ce0..000000000
--- a/res/layout/drop_badge.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<com.android.documentsui.DropBadgeView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@android:id/icon"
-        android:layout_width="26dp"
-        android:layout_height="26dp"
-        android:scaleType="centerInside"
-        android:contentDescription="@null"
-        android:duplicateParentState="true"/>
\ No newline at end of file
diff --git a/res/layout/fixed_layout.xml b/res/layout/fixed_layout.xml
deleted file mode 100644
index fb2cb2452..000000000
--- a/res/layout/fixed_layout.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<!-- CoordinatorLayout is necessary for various components (e.g. Snackbars, and
-     floating action buttons) to operate correctly. -->
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/coordinator_layout"
-    android:focusable="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
-            android:layout_margin="@dimen/search_bar_margin"
-            android:background="?android:attr/colorBackground"
-            android:elevation="3dp"
-            android:theme="?actionBarTheme"
-            android:popupTheme="?actionBarPopupTheme"
-            app:collapseContentDescription="@string/button_back"
-            app:titleTextAppearance="@style/ToolbarTitle">
-
-            <TextView
-                android:id="@+id/searchbar_title"
-                android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
-                android:layout_marginStart="@dimen/search_bar_text_margin_start"
-                android:layout_marginEnd="@dimen/search_bar_text_margin_end"
-                android:paddingStart="@dimen/search_bar_icon_padding"
-                android:gravity="center_vertical"
-                android:text="@string/search_bar_hint"
-                android:textAppearance="@style/SearchBarTitle"
-                android:drawableStart="@drawable/ic_menu_search"
-                android:drawablePadding="@dimen/search_bar_icon_padding"/>
-
-        </androidx.appcompat.widget.Toolbar>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="horizontal"
-            android:baselineAligned="false">
-
-            <FrameLayout
-                android:id="@+id/container_roots"
-                android:layout_width="256dp"
-                android:layout_height="match_parent" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:elevation="8dp">
-
-                <include layout="@layout/directory_header" />
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1">
-
-                    <FrameLayout
-                        android:id="@+id/container_directory"
-                        android:clipToPadding="false"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
-
-                    <FrameLayout
-                        android:id="@+id/container_search_fragment"
-                        android:clipToPadding="false"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
-
-                </FrameLayout>
-
-                <androidx.coordinatorlayout.widget.CoordinatorLayout
-                    android:id="@+id/container_save"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?android:attr/colorBackgroundFloating"
-                    android:elevation="8dp" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/layout/fragment_directory.xml b/res/layout/fragment_directory.xml
deleted file mode 100644
index 015039a6a..000000000
--- a/res/layout/fragment_directory.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<com.android.documentsui.dirlist.AnimationView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/colorBackground"
-    android:outlineProvider="bounds"
-    android:elevation="4dp"
-    android:orientation="vertical">
-
-    <ProgressBar
-        android:id="@+id/progressbar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/progress_bar_height"
-        android:indeterminate="true"
-        style="@style/TrimmedHorizontalProgressBar"
-        android:visibility="gone"/>
-
-    <com.android.documentsui.dirlist.DocumentsSwipeRefreshLayout
-        android:id="@+id/refresh_layout"
-        android:background="@android:color/transparent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/dir_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingStart="0dp"
-            android:paddingEnd="0dp"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
-            android:clipToPadding="false"
-            android:scrollbars="none"
-            android:drawSelectorOnTop="true"
-            app:fastScrollEnabled="false"/>
-
-    </com.android.documentsui.dirlist.DocumentsSwipeRefreshLayout>
-
-</com.android.documentsui.dirlist.AnimationView>
diff --git a/res/layout/fragment_pick.xml b/res/layout/fragment_pick.xml
deleted file mode 100644
index cba4ecb9a..000000000
--- a/res/layout/fragment_pick.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2014 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:baselineAligned="false"
-    android:gravity="center_vertical|end"
-    android:paddingStart="@dimen/bottom_bar_padding"
-    android:paddingEnd="@dimen/bottom_bar_padding">
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@android:id/button2"
-        style="?attr/materialButtonOutlinedStyle"
-        app:cornerRadius="@dimen/button_corner_radius"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:text="@android:string/cancel" />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@android:id/button1"
-            style="?attr/materialButtonStyle"
-            app:cornerRadius="@dimen/button_corner_radius"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
-            android:backgroundTint="@color/fragment_pick_button_background_color"
-            android:textColor="@color/fragment_pick_button_text_color"
-            android:layout_marginEnd="4dp" />
-
-        <!-- Handles touch events when button1 is disabled. -->
-        <FrameLayout
-            android:id="@+id/pick_button_overlay"
-            android:importantForAccessibility="no"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </FrameLayout>
-
-</LinearLayout>
diff --git a/res/layout/fragment_roots.xml b/res/layout/fragment_roots.xml
deleted file mode 100644
index af7861992..000000000
--- a/res/layout/fragment_roots.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<com.android.documentsui.sidebar.RootsList xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/roots_list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="8dp"
-    android:keyboardNavigationCluster="true"
-    android:divider="@null"/>
diff --git a/res/layout/fragment_save.xml b/res/layout/fragment_save.xml
deleted file mode 100644
index 0f46b2a9c..000000000
--- a/res/layout/fragment_save.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="@dimen/list_item_padding"
-    android:paddingEnd="@dimen/bottom_bar_padding"
-    android:orientation="horizontal"
-    android:baselineAligned="false"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall">
-
-    <FrameLayout
-        android:layout_width="@dimen/icon_size"
-        android:layout_height="@dimen/icon_size"
-        android:layout_marginEnd="16dp">
-
-        <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="@dimen/root_icon_size"
-            android:layout_height="match_parent"
-            android:scaleType="centerInside"
-            android:contentDescription="@null" />
-
-    </FrameLayout>
-
-    <EditText
-        android:id="@android:id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:singleLine="true"
-        android:selectAllOnFocus="true" />
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@android:id/button1"
-            style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
-            app:cornerRadius="@dimen/button_corner_radius"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
-            android:layout_marginEnd="4dp"
-            android:text="@string/menu_save"/>
-
-        <ProgressBar
-            android:id="@android:id/progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone"
-            android:indeterminate="true"
-            android:padding="8dp"
-            style="?android:attr/progressBarStyle" />
-
-    </FrameLayout>
-
-</LinearLayout>
diff --git a/res/layout/fragment_search.xml b/res/layout/fragment_search.xml
deleted file mode 100644
index 02baffdd3..000000000
--- a/res/layout/fragment_search.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/colorBackground">
-
-    <!-- used for search chip. -->
-    <include layout="@layout/search_chip_row"/>
-
-    <ListView
-        android:id="@+id/history_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:divider="@null"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/inspector_action_view.xml b/res/layout/inspector_action_view.xml
deleted file mode 100644
index 422638348..000000000
--- a/res/layout/inspector_action_view.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include
-        layout="@layout/inspector_section_title"
-        android:id="@+id/action_header" />
-
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/default_app_info"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="10dp"
-        android:layout_below="@id/action_header">
-
-        <ImageView
-            android:id="@+id/app_icon"
-            android:paddingLeft="5dp"
-            android:layout_width="50dp"
-            android:layout_height="50dp" />
-
-        <TextView
-            android:id="@+id/app_name"
-            android:paddingLeft="16dp"
-            android:paddingBottom="10dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/app_icon"
-            android:layout_centerVertical="true"/>
-
-        <ImageButton
-            android:id="@+id/inspector_action_button"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@null"/>
-
-        </RelativeLayout>
-
-</RelativeLayout>
diff --git a/res/layout/inspector_activity.xml b/res/layout/inspector_activity.xml
deleted file mode 100644
index 8763351c9..000000000
--- a/res/layout/inspector_activity.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2017 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.
--->
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/inspector_root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?android:colorBackground">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/actionBarSize"
-            app:titleEnabled="false"
-            app:statusBarScrim="@android:color/transparent"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <android.widget.Space
-                    android:layout_width="match_parent"
-                    android:layout_height="?android:attr/actionBarSize"/>
-
-                <com.android.documentsui.inspector.HeaderView
-                    android:id="@+id/inspector_header_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/inspector_header_height"
-                    app:layout_collapseMode="parallax"/>
-            </LinearLayout>
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
-                android:theme="?actionBarTheme"
-                app:title="@string/inspector_title"
-                app:titleTextAppearance="@style/ToolbarTitle"
-                app:layout_collapseMode="pin">
-            </androidx.appcompat.widget.Toolbar>
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:behavior_overlapTop="10dp"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:id="@+id/inspector_container"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/bottom_sheet_dialog_background"
-            android:paddingBottom="5dp">
-
-            <com.android.documentsui.inspector.DetailsView
-                android:id="@+id/inspector_details_view"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-            <com.android.documentsui.inspector.MediaView
-                android:id="@+id/inspector_media_view"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
-            <com.android.documentsui.inspector.actions.ActionView
-                android:id="@+id/inspector_show_in_provider_view"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"/>
-
-            <com.android.documentsui.inspector.actions.ActionView
-                android:id="@+id/inspector_app_defaults_view"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"/>
-
-            <com.android.documentsui.inspector.DebugView
-                android:id="@+id/inspector_debug_view"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="20dp"
-                android:visibility="gone" />
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/layout/inspector_header.xml b/res/layout/inspector_header.xml
deleted file mode 100644
index 94a092790..000000000
--- a/res/layout/inspector_header.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/inspector_thumbnail"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitCenter"
-        android:alpha="0.0"
-        android:background="?android:colorBackgroundFloating" />
-
-</RelativeLayout>
diff --git a/res/layout/inspector_section_title.xml b/res/layout/inspector_section_title.xml
deleted file mode 100644
index 358b9613c..000000000
--- a/res/layout/inspector_section_title.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2017 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    android:divider="@drawable/inspector_separator"
-    android:showDividers="beginning"
-    android:paddingStart="10dp"
-    android:paddingEnd="10dp">
-
-    <!--Empty view for keeping divider when title is gone-->
-    <android.widget.Space
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content">
-    </android.widget.Space >
-
-    <TextView
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:id="@+id/inspector_header_title"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:paddingTop="25dp"
-        android:paddingBottom="25dp"
-        android:layout_gravity="center_vertical"
-        android:clickable="false"
-        android:textAppearance="@style/ToolbarTitle"
-        android:textAlignment="viewStart"
-        android:textIsSelectable="true"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/item_dir_grid.xml b/res/layout/item_dir_grid.xml
deleted file mode 100644
index bd690d4d3..000000000
--- a/res/layout/item_dir_grid.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     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.
--->
-
-<!-- FYI: This layout has an extra top level container view that was previously used
-     to allow for the insertion of debug info. The debug info is now gone, but the
-     container remains because there is a high likelihood of UI regression relating
-     to focus and selection states, some of which are specific to keyboard
-     when touch mode is not enable. So, if you, heroic engineer of the future,
-     decide to rip these out, please be sure to check out focus and keyboards. -->
-<com.google.android.material.card.MaterialCardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/item_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="4dp"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    app:cardElevation="0dp">
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="0dp"
-        android:duplicateParentState="true"
-        app:cardElevation="0dp"
-        app:strokeWidth="1dp"
-        app:strokeColor="?android:strokeColor">
-
-        <!-- The height is 48px.
-             paddingTop (9dp) + @dimen/check_icon_size (30dp) + paddingBottom (9dp) -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:background="?android:attr/colorBackground"
-            android:gravity="center_vertical">
-
-            <FrameLayout
-                android:id="@+id/icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:pointerIcon="hand"
-                android:paddingBottom="9dp"
-                android:paddingStart="9dp"
-                android:paddingEnd="8dp"
-                android:paddingTop="9dp">
-
-                <ImageView
-                    android:id="@+id/icon_mime_sm"
-                    android:layout_width="@dimen/grid_item_icon_size"
-                    android:layout_height="@dimen/grid_item_icon_size"
-                    android:layout_gravity="center"
-                    android:contentDescription="@null"
-                    android:scaleType="centerInside"/>
-
-                <ImageView
-                    android:id="@+id/icon_check"
-                    android:layout_width="@dimen/check_icon_size"
-                    android:layout_height="@dimen/check_icon_size"
-                    android:alpha="0"
-                    android:contentDescription="@null"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/ic_check_circle"/>
-
-            </FrameLayout>
-
-            <ImageView
-                android:id="@+id/icon_profile_badge"
-                android:layout_height="@dimen/briefcase_icon_size"
-                android:layout_width="@dimen/briefcase_icon_size"
-                android:layout_marginEnd="@dimen/briefcase_icon_margin"
-                android:src="@drawable/ic_briefcase"
-                android:tint="?android:attr/colorAccent"
-                android:contentDescription="@string/a11y_work"/>
-
-            <TextView
-                android:id="@android:id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textAlignment="viewStart"
-                android:textAppearance="@style/CardPrimaryText"
-                android:layout_marginBottom="9dp"
-                android:layout_marginEnd="12dp"
-                android:layout_marginTop="9dp"/>
-
-        </LinearLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-
-    <!-- An overlay that draws the item border when it is focused. -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/item_doc_grid_border_rounded"
-        android:contentDescription="@null"
-        android:duplicateParentState="true"/>
-
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/res/layout/item_doc_grid.xml b/res/layout/item_doc_grid.xml
deleted file mode 100644
index d654571eb..000000000
--- a/res/layout/item_doc_grid.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<!-- FYI: This layout has an extra top level container view that was previously used
-     to allow for the insertion of debug info. The debug info is now gone, but the
-     container remains because there is a high likelihood of UI regression relating
-     to focus and selection states, some of which are specific to keyboard
-     when touch mode is not enable. So, if you, heroic engineer of the future,
-     decide to rip these out, please be sure to check out focus and keyboards. -->
-<com.google.android.material.card.MaterialCardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/item_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="4dp"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    app:cardElevation="0dp">
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="0dp"
-        android:duplicateParentState="true"
-        app:cardElevation="0dp"
-        app:strokeWidth="1dp"
-        app:strokeColor="?android:strokeColor">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:duplicateParentState="true">
-
-            <!-- Main item thumbnail.  Comprised of two overlapping images, the
-                 visibility of which is controlled by code in
-                 DirectoryFragment.java. -->
-
-            <FrameLayout
-                android:id="@+id/thumbnail"
-                android:background="?attr/gridItemTint"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <com.android.documentsui.GridItemThumbnail
-                    android:id="@+id/icon_thumb"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scaleType="centerCrop"
-                    android:contentDescription="@null"
-                    android:tint="?attr/gridItemTint"
-                    android:tintMode="src_over"/>
-
-                <com.android.documentsui.GridItemThumbnail
-                    android:id="@+id/icon_mime_lg"
-                    android:layout_width="@dimen/icon_size"
-                    android:layout_height="@dimen/icon_size"
-                    android:layout_gravity="center"
-                    android:scaleType="fitCenter"
-                    android:contentDescription="@null"/>
-
-            </FrameLayout>
-
-            <FrameLayout
-                android:id="@+id/preview_icon"
-                android:layout_width="@dimen/button_touch_size"
-                android:layout_height="@dimen/button_touch_size"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:pointerIcon="hand"
-                android:focusable="true"
-                android:clickable="true">
-
-                <ImageView
-                    android:layout_width="@dimen/zoom_icon_size"
-                    android:layout_height="@dimen/zoom_icon_size"
-                    android:padding="2dp"
-                    android:layout_gravity="center"
-                    android:background="@drawable/circle_button_background"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/ic_zoom_out"/>
-
-            </FrameLayout>
-
-            <!-- Item nameplate.  Has a mime-type icon and some text fields (title,
-                 size, mod-time, etc). -->
-
-            <LinearLayout
-                android:id="@+id/nameplate"
-                android:background="?android:attr/colorBackground"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/thumbnail">
-
-                <FrameLayout
-                    android:id="@+id/icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_centerVertical="true"
-                    android:pointerIcon="hand"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
-                    android:paddingStart="12dp"
-                    android:paddingEnd="8dp">
-
-                    <ImageView
-                        android:id="@+id/icon_mime_sm"
-                        android:layout_width="@dimen/grid_item_icon_size"
-                        android:layout_height="@dimen/grid_item_icon_size"
-                        android:layout_gravity="center"
-                        android:scaleType="center"
-                        android:contentDescription="@null"/>
-
-                    <ImageView
-                        android:id="@+id/icon_check"
-                        android:src="@drawable/ic_check_circle"
-                        android:alpha="0"
-                        android:layout_width="@dimen/check_icon_size"
-                        android:layout_height="@dimen/check_icon_size"
-                        android:layout_gravity="center"
-                        android:scaleType="fitCenter"
-                        android:contentDescription="@null"/>
-
-                </FrameLayout>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingBottom="8dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="12dp">
-
-                    <ImageView
-                        android:id="@+id/icon_profile_badge"
-                        android:layout_height="@dimen/briefcase_icon_size"
-                        android:layout_width="@dimen/briefcase_icon_size"
-                        android:layout_marginEnd="@dimen/briefcase_icon_margin"
-                        android:layout_alignTop="@android:id/title"
-                        android:layout_alignBottom="@android:id/title"
-                        android:gravity="center_vertical"
-                        android:src="@drawable/ic_briefcase"
-                        android:tint="?android:attr/colorAccent"
-                        android:contentDescription="@string/a11y_work"/>
-
-                    <TextView
-                        android:id="@android:id/title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentTop="true"
-                        android:layout_toEndOf="@+id/icon_profile_badge"
-                        android:singleLine="true"
-                        android:ellipsize="end"
-                        android:textAlignment="viewStart"
-                        android:textAppearance="@style/CardPrimaryText"/>
-
-                    <TextView
-                        android:id="@+id/details"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@android:id/title"
-                        android:layout_marginEnd="4dp"
-                        android:singleLine="true"
-                        android:ellipsize="end"
-                        android:textAlignment="viewStart"
-                        android:textAppearance="@style/ItemCaptionText" />
-
-                    <TextView
-                        android:id="@+id/date"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@android:id/title"
-                        android:layout_toEndOf="@id/details"
-                        android:singleLine="true"
-                        android:ellipsize="end"
-                        android:textAlignment="viewStart"
-                        android:textAppearance="@style/ItemCaptionText" />
-
-                </RelativeLayout>
-
-            </LinearLayout>
-
-        </RelativeLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-
-    <!-- An overlay that draws the item border when it is focused. -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/item_doc_grid_border_rounded"
-        android:contentDescription="@null"
-        android:duplicateParentState="true"/>
-
-</com.google.android.material.card.MaterialCardView>
diff --git a/res/layout/item_doc_header_message.xml b/res/layout/item_doc_header_message.xml
deleted file mode 100644
index 4b2cf355f..000000000
--- a/res/layout/item_doc_header_message.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/item_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:elevation="0dp"
-        android:duplicateParentState="true"
-        app:cardElevation="0dp"
-        app:strokeWidth="1dp"
-        app:strokeColor="?android:strokeColor">
-
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:background="?android:attr/colorBackground"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:animateLayoutChanges="true"
-                android:id="@+id/message_container"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:minHeight="60dp"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:contentDescription="@null"
-                    android:id="@+id/message_icon"
-                    android:layout_height="@dimen/icon_size"
-                    android:layout_width="@dimen/icon_size"
-                    android:layout_margin="8dp"
-                    android:layout_gravity="center"
-                    android:scaleType="centerInside"/>
-
-                <LinearLayout
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:minHeight="48dp"
-                    android:paddingTop="12dp"
-                    android:paddingEnd="12dp"
-                    android:gravity="center_vertical"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/message_title"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:textSize="16sp"
-                        android:textAppearance="@style/DrawerMenuPrimary"/>
-
-                    <TextView
-                        android:id="@+id/message_subtitle"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:selectAllOnFocus="true"
-                        android:textSize="12sp"/>
-
-                    <TextView
-                        android:id="@+id/message_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:selectAllOnFocus="true"/>
-
-                    <Button
-                        android:id="@+id/dismiss_button"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="end"
-                        android:text="@android:string/ok"
-                        style="@style/DialogTextButton"/>
-
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/action_view"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:orientation="vertical">
-
-                <Button
-                    android:id="@+id/action_button"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:layout_marginEnd="16dp"
-                    android:layout_gravity="end"
-                    style="@style/DialogTextButton"/>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-</FrameLayout>
diff --git a/res/layout/item_doc_inflated_message.xml b/res/layout/item_doc_inflated_message.xml
deleted file mode 100644
index abfdbfd10..000000000
--- a/res/layout/item_doc_inflated_message.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/empty"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/colorBackground"
-    android:focusable="true">
-
-    <include android:id="@+id/content" layout="@layout/item_doc_inflated_message_content"/>
-    <include android:id="@+id/cross_profile"
-             layout="@layout/item_doc_inflated_message_cross_profile"/>
-</FrameLayout>
diff --git a/res/layout/item_doc_inflated_message_content.xml b/res/layout/item_doc_inflated_message_content.xml
deleted file mode 100644
index 0635e1654..000000000
--- a/res/layout/item_doc_inflated_message_content.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2020 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.
-  -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/artwork"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="25dp"
-        android:layout_marginBottom="25dp"
-        android:scaleType="fitCenter"
-        android:maxHeight="250dp"
-        android:adjustViewBounds="true"
-        android:gravity="bottom|center_horizontal"
-        android:contentDescription="@null"/>
-
-    <TextView
-        android:id="@+id/message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="25dp"
-        android:gravity="center_horizontal"
-        style="?android:attr/textAppearanceListItem"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/item_doc_inflated_message_cross_profile.xml b/res/layout/item_doc_inflated_message_cross_profile.xml
deleted file mode 100644
index 3cc0d7ce2..000000000
--- a/res/layout/item_doc_inflated_message_cross_profile.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2020 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.
-  -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    android:paddingTop="@dimen/item_doc_inflated_message_padding_top"
-    android:paddingStart="72dp"
-    android:paddingEnd="72dp">
-
-    <ProgressBar
-        android:id="@+id/cross_profile_progress"
-        style="@android:style/Widget.Material.Light.ProgressBar"
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        android:indeterminateTint="?attr/colorAccent"/>
-
-    <LinearLayout
-        android:id="@+id/cross_profile_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center_horizontal">
-
-        <ImageView
-            android:id="@+id/artwork"
-            android:layout_width="24dp"
-            android:layout_height="24dp"/>
-        <TextView
-            android:id="@+id/title"
-            android:layout_marginTop="8dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:textAppearance="@style/EmptyStateTitleText"/>
-        <TextView
-            android:id="@+id/message"
-            android:layout_marginTop="@dimen/cross_profile_button_message_margin_top"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:textAppearance="@style/EmptyStateMessageText"/>
-        <Button
-            android:id="@+id/button"
-            android:layout_marginTop="16dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:cornerRadius="@dimen/cross_profile_button_corner_radius"
-            app:strokeWidth="@dimen/cross_profile_button_stroke_width"
-            app:strokeColor="@color/work_profile_button_stroke_color"
-            style="@style/EmptyStateButton"/>
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/item_doc_list.xml b/res/layout/item_doc_list.xml
deleted file mode 100644
index 77494a29c..000000000
--- a/res/layout/item_doc_list.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-     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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/item_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/list_item_background"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:baselineAligned="false"
-        android:gravity="center_vertical"
-        android:minHeight="@dimen/list_item_height"
-        android:orientation="horizontal">
-
-      <FrameLayout
-          android:id="@+id/icon"
-          android:pointerIcon="hand"
-          android:layout_width="@dimen/list_item_width"
-          android:layout_height="@dimen/list_item_height"
-          android:paddingBottom="@dimen/list_item_icon_padding"
-          android:paddingTop="@dimen/list_item_icon_padding"
-          android:paddingEnd="16dp"
-          android:paddingStart="@dimen/list_item_padding">
-
-        <com.google.android.material.card.MaterialCardView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:cardBackgroundColor="@android:color/transparent"
-            app:cardElevation="0dp">
-
-          <ImageView
-              android:id="@+id/icon_mime"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center"
-              android:contentDescription="@null"
-              android:scaleType="centerInside" />
-
-          <ImageView
-              android:id="@+id/icon_thumb"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:contentDescription="@null"
-              android:scaleType="centerCrop" />
-
-          <ImageView
-              android:id="@+id/icon_check"
-              android:layout_width="@dimen/check_icon_size"
-              android:layout_height="@dimen/check_icon_size"
-              android:layout_gravity="center"
-              android:alpha="0"
-              android:contentDescription="@null"
-              android:scaleType="fitCenter"
-              android:src="@drawable/ic_check_circle" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-      </FrameLayout>
-
-      <LinearLayout
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:orientation="vertical"
-          android:layout_gravity="center_vertical"
-          android:layout_marginEnd="@dimen/list_item_padding">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-          <ImageView
-              android:id="@+id/icon_profile_badge"
-              android:layout_height="@dimen/briefcase_icon_size"
-              android:layout_width="@dimen/briefcase_icon_size"
-              android:layout_marginEnd="@dimen/briefcase_icon_margin"
-              android:layout_gravity="center_vertical"
-              android:src="@drawable/ic_briefcase"
-              android:tint="?android:attr/colorAccent"
-              android:contentDescription="@string/a11y_work" />
-
-          <TextView
-              android:id="@android:id/title"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:ellipsize="end"
-              android:singleLine="true"
-              android:textAlignment="viewStart"
-              android:textAppearance="?android:attr/textAppearanceListItem" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/line2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:baselineAligned="false"
-            android:layout_marginTop="4dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-          <TextView
-              android:id="@+id/metadata"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:ellipsize="end"
-              android:singleLine="true"
-              android:textAppearance="@style/ItemCaptionText" />
-
-        </LinearLayout>
-
-      </LinearLayout>
-
-      <FrameLayout
-          android:id="@+id/preview_icon"
-          android:layout_width="@dimen/list_item_width"
-          android:layout_height="@dimen/list_item_height"
-          android:padding="@dimen/list_item_icon_padding"
-          android:focusable="true"
-          android:clickable="true">
-
-        <ImageView
-            android:layout_width="@dimen/check_icon_size"
-            android:layout_height="@dimen/check_icon_size"
-            android:layout_gravity="center"
-            android:scaleType="fitCenter"
-            android:tint="?android:attr/colorControlNormal"
-            android:src="@drawable/ic_zoom_out" />
-
-      </FrameLayout>
-
-    </LinearLayout>
-
-  <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:layout_marginStart="72dp"
-      android:layout_marginEnd="8dp"
-      android:background="?android:strokeColor" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/item_history.xml b/res/layout/item_history.xml
deleted file mode 100644
index 7bb76b35b..000000000
--- a/res/layout/item_history.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:gravity="center_vertical">
-
-    <ImageView
-        android:layout_width="@dimen/button_touch_size"
-        android:layout_height="@dimen/button_touch_size"
-        android:src="@drawable/ic_history"
-        android:scaleType="centerInside"/>
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:gravity="center_vertical"/>
-
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="@dimen/button_touch_size"
-        android:layout_height="@dimen/button_touch_size"
-        android:background="@drawable/generic_ripple_background"
-        android:src="@drawable/ic_action_clear"
-        android:scaleType="centerInside"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/item_photo_grid.xml b/res/layout/item_photo_grid.xml
deleted file mode 100644
index 4581d3d25..000000000
--- a/res/layout/item_photo_grid.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-
-<!-- FYI: This layout has an extra top level container view that was previously used
-     to allow for the insertion of debug info. The debug info is now gone, but the
-     container remains because there is a high likelihood of UI regression relating
-     to focus and selection states, some of which are specific to keyboard
-     when touch mode is not enable. So, if you, heroic engineer of the future,
-     decide to rip these out, please be sure to check out focus and keyboards. -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:layout_margin="4dp"
-    android:background="@drawable/grid_item_background"
-    android:elevation="@dimen/grid_item_elevation"
-    android:focusable="true">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:duplicateParentState="true">
-
-        <!-- Main item thumbnail. Comprised of two overlapping images, the
-             visibility of which is controlled by code in
-             DirectoryFragment.java. -->
-
-        <FrameLayout
-            android:id="@+id/thumbnail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.android.documentsui.GridItemThumbnail
-                android:id="@+id/icon_thumb"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                android:tint="?attr/gridItemTint"
-                android:tintMode="src_over"/>
-
-            <com.android.documentsui.GridItemThumbnail
-                android:id="@+id/icon_mime_lg"
-                android:layout_width="@dimen/icon_size"
-                android:layout_height="@dimen/icon_size"
-                android:layout_gravity="center"
-                android:scaleType="fitCenter"
-                android:contentDescription="@null"/>
-
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="@dimen/button_touch_size"
-            android:layout_height="@dimen/button_touch_size"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentStart="true"
-            android:pointerIcon="hand">
-
-            <ImageView
-                android:id="@+id/icon_check"
-                android:src="@drawable/ic_check_circle"
-                android:alpha="0"
-                android:layout_width="@dimen/check_icon_size"
-                android:layout_height="@dimen/check_icon_size"
-                android:layout_gravity="center"
-                android:scaleType="fitCenter"
-                android:contentDescription="@null"/>
-
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/preview_icon"
-            android:layout_width="@dimen/button_touch_size"
-            android:layout_height="@dimen/button_touch_size"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true"
-            android:pointerIcon="hand"
-            android:focusable="true"
-            android:clickable="true">
-
-            <ImageView
-                android:layout_width="@dimen/zoom_icon_size"
-                android:layout_height="@dimen/zoom_icon_size"
-                android:padding="2dp"
-                android:layout_gravity="center"
-                android:background="@drawable/circle_button_background"
-                android:scaleType="fitCenter"
-                android:src="@drawable/ic_zoom_out"/>
-
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/icon_profile_badge"
-            android:layout_width="@dimen/button_touch_size"
-            android:layout_height="@dimen/button_touch_size"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:pointerIcon="hand">
-
-            <ImageView
-                android:id="@+id/icon_id"
-                android:layout_height="@dimen/briefcase_icon_size_photo"
-                android:layout_width="@dimen/briefcase_icon_size_photo"
-                android:src="@drawable/ic_briefcase_white"
-                android:tint="?android:attr/colorAccent"
-                android:padding="5dp"
-                android:background="@drawable/circle_button_background"
-                android:layout_gravity="center"
-                android:scaleType="fitCenter"
-                android:contentDescription="@string/a11y_work"/>
-        </FrameLayout>
-
-        <!-- An overlay that draws the item border when it is focused. -->
-        <View
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/thumbnail"
-            android:layout_alignTop="@id/thumbnail"
-            android:layout_alignLeft="@id/thumbnail"
-            android:layout_alignRight="@id/thumbnail"
-            android:contentDescription="@null"
-            android:background="@drawable/item_doc_grid_border"
-            android:duplicateParentState="true"/>
-
-    </RelativeLayout>
-
-</LinearLayout>
diff --git a/res/layout/item_root.xml b/res/layout/item_root.xml
deleted file mode 100644
index 8d0f86bad..000000000
--- a/res/layout/item_root.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<com.android.documentsui.sidebar.RootItemView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="52dp"
-    android:paddingStart="24dp"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:baselineAligned="false"
-    android:background="@drawable/root_item_background">
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/icon_size"
-        android:duplicateParentState="true">
-
-        <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="@dimen/root_icon_size"
-            android:layout_height="match_parent"
-            android:scaleType="centerInside"
-            android:contentDescription="@null"
-            android:duplicateParentState="true" />
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:orientation="vertical"
-        android:layout_weight="1">
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textAlignment="viewStart"
-            android:textAppearance="@style/DrawerMenuPrimary" />
-
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textAlignment="viewStart"
-            android:textAppearance="@style/DrawerMenuSecondary" />
-
-    </LinearLayout>
-
-    <include layout="@layout/root_vertical_divider" />
-
-    <FrameLayout
-        android:id="@+id/action_icon_area"
-        android:layout_width="@dimen/button_touch_size"
-        android:layout_height="@dimen/button_touch_size"
-        android:paddingEnd="@dimen/grid_padding_horiz"
-        android:duplicateParentState="true"
-        android:visibility="gone">
-
-        <ImageView
-            android:id="@+id/action_icon"
-            android:focusable="false"
-            android:layout_width="@dimen/root_action_icon_size"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:scaleType="centerInside"/>
-
-    </FrameLayout>
-
-</com.android.documentsui.sidebar.RootItemView>
diff --git a/res/layout/item_root_header.xml b/res/layout/item_root_header.xml
deleted file mode 100644
index f82b1577d..000000000
--- a/res/layout/item_root_header.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    android:gravity="center_vertical">
-
-    <TextView
-        android:id="@android:id/title"
-        android:paddingStart="64dp"
-        android:layout_width="wrap_content"
-        android:layout_height="44dp"
-        android:gravity="center_vertical"
-        style="@style/DrawerMenuHeader"/>
-
-</LinearLayout>
diff --git a/res/layout/item_root_spacer.xml b/res/layout/item_root_spacer.xml
deleted file mode 100644
index 16ecee7fd..000000000
--- a/res/layout/item_root_spacer.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="@dimen/root_spacer_padding"
-    android:paddingTop="12dp"
-    android:paddingBottom="12dp">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?android:attr/listDivider" />
-
-</FrameLayout>
diff --git a/res/layout/navigation_breadcrumb_item.xml b/res/layout/navigation_breadcrumb_item.xml
deleted file mode 100644
index 93d3feb3f..000000000
--- a/res/layout/navigation_breadcrumb_item.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 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.
--->
-
-
-<!--
-     CoordinatorLayout is necessary for various components (e.g. Snackbars, and
-     floating action buttons) to operate correctly.
--->
-<!--
-     focusableInTouchMode is set in order to force key events to go to the activity's global key
-     callback, which is necessary for proper event routing. See BaseActivity.onKeyDown.
--->
-
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
-  android:minHeight="48dp"
-  android:focusable="true"
-  android:gravity="center_vertical"
-  android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/breadcrumb_text"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:maxWidth="275dp"
-        android:gravity="center_vertical"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:textAppearance="@style/BreadcrumbText"
-        android:background="@drawable/breadcrumb_item_background" />
-
-    <ImageView
-        android:id="@+id/breadcrumb_arrow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_breadcrumb_arrow"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/root_vertical_divider.xml b/res/layout/root_vertical_divider.xml
deleted file mode 100644
index 6b9c72341..000000000
--- a/res/layout/root_vertical_divider.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2018 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.
-  -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/vertical_divider"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:gravity="start|center_vertical"
-    android:orientation="horizontal"
-    android:paddingTop="@dimen/drawer_edge_width"
-    android:paddingBottom="@dimen/drawer_edge_width"
-    android:paddingStart="@dimen/grid_padding_horiz"
-    android:paddingEnd="@dimen/grid_padding_horiz"
-    android:visibility="gone">
-    <View
-        android:layout_width="1dp"
-        android:layout_height="match_parent"
-        android:background="?android:attr/listDivider"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/search_chip_item.xml b/res/layout/search_chip_item.xml
deleted file mode 100644
index 3ee00c290..000000000
--- a/res/layout/search_chip_item.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-
-<com.google.android.material.chip.Chip
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:checkable="true"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/search_chip_half_spacing"
-    android:layout_marginEnd="@dimen/search_chip_half_spacing"
-    android:textAppearance="@style/SearchChipText"
-    android:textColor="@color/search_chip_text_color"
-    app:checkedIcon="@drawable/ic_check"
-    app:chipBackgroundColor="@color/search_chip_background_color"
-    app:chipCornerRadius="@dimen/search_chip_radius"
-    app:chipStrokeColor="@color/search_chip_stroke_color"
-    app:chipStrokeWidth="1dp"
-    app:iconStartPadding="@dimen/search_chip_icon_padding"
-    app:rippleColor="@color/search_chip_ripple_color"
-    app:chipMinTouchTargetSize="@dimen/button_touch_size"
-/>
\ No newline at end of file
diff --git a/res/layout/search_chip_row.xml b/res/layout/search_chip_row.xml
deleted file mode 100644
index ad0ac43c8..000000000
--- a/res/layout/search_chip_row.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-
-<HorizontalScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
-        <LinearLayout
-            android:id="@+id/search_chip_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/search_chip_group_margin"
-            android:layout_marginEnd="@dimen/search_chip_group_margin"/>
-    </FrameLayout>
-</HorizontalScrollView>
\ No newline at end of file
diff --git a/res/layout/sort_list_item.xml b/res/layout/sort_list_item.xml
deleted file mode 100644
index c2f50c8b8..000000000
--- a/res/layout/sort_list_item.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-
-<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
-                 android:id="@android:id/text1"
-                 android:layout_width="match_parent"
-                 android:layout_height="?android:attr/listPreferredItemHeightSmall"
-                 android:textAppearance="@style/SortList"
-                 android:gravity="center_vertical"
-                 android:checkMark="@drawable/list_checker"
-                 android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-                 android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
\ No newline at end of file
diff --git a/res/layout/table_key_value_row.xml b/res/layout/table_key_value_row.xml
deleted file mode 100644
index 6a0b4be13..000000000
--- a/res/layout/table_key_value_row.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2017 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.
--->
-<com.android.documentsui.inspector.KeyValueRow
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingStart="30dp"
-    android:paddingEnd="30dp">
-
-    <TextView
-        android:id="@+id/table_row_key"
-        android:layout_height="wrap_content"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:paddingTop="13dp"
-        android:paddingBottom="13dp"
-        android:paddingEnd="5dp"
-        android:textAlignment="viewStart"
-        android:textAppearance="?attr/textAppearanceSubtitle1">
-    </TextView>
-
-    <TextView
-        android:id="@+id/table_row_value"
-        android:layout_height="wrap_content"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:paddingTop="13dp"
-        android:paddingBottom="13dp"
-        android:clickable="false"
-        android:textIsSelectable="true"
-        android:textAlignment="viewStart"
-        android:textAppearance="@style/InspectorKeySubTitle">
-    </TextView>
-
-</com.android.documentsui.inspector.KeyValueRow>
diff --git a/res/values-h600dp-v31/dimens.xml b/res/values-h600dp-v31/dimens.xml
deleted file mode 100644
index 6da529151..000000000
--- a/res/values-h600dp-v31/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2020 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.
-  -->
-<resources>
-    <dimen name="item_doc_inflated_message_padding_top">30dp</dimen>
-</resources>
diff --git a/res/values-h600dp/dimens.xml b/res/values-h600dp/dimens.xml
deleted file mode 100644
index d21465289..000000000
--- a/res/values-h600dp/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2020 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.
-  -->
-<resources>
-    <dimen name="item_doc_inflated_message_padding_top">100dp</dimen>
-</resources>
diff --git a/res/values-night-v31/colors.xml b/res/values-night-v31/colors.xml
deleted file mode 100644
index c5e4f6d90..000000000
--- a/res/values-night-v31/colors.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- 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.
--->
-
-<resources>
-  <color name="tab_selected_text_color">@android:color/black</color>
-  <color name="work_profile_button_stroke_color">
-    @*android:color/system_accent1_200
-  </color> <!-- accent 200 -->
-  <color name="empty_state_text_color">@*android:color/system_neutral1_100
-  </color>
-  <!-- neutral 100 -->
-  <color name="empty_state_message_text_color">
-    @*android:color/system_neutral2_200
-  </color>
-  <!-- neutral variant 200 -->
-  <color name="tab_unselected_text_color">@*android:color/system_neutral2_200
-  </color>
-  <!-- neutral variant 200 -->
-  <color name="profile_tab_default_color">@*android:color/system_neutral1_800
-  </color>
-  <!-- neutral 800 -->
-  <color name="profile_tab_selected_color">@*android:color/system_neutral2_100
-  </color>
-  <!-- neutral variant 100 -->
-  <color name="fragment_pick_inactive_button_color">
-    @*android:color/system_neutral1_800
-  </color>
-  <!-- neutral 100 -->
-  <color name="fragment_pick_inactive_text_color">
-    @*android:color/system_neutral1_600
-  </color>
-  <!-- neutral 600 -->
-  <color name="fragment_pick_active_button_color">
-    @*android:color/system_neutral2_100
-  </color>
-  <!-- neutral variant 100 -->
-  <color name="fragment_pick_active_text_color">@android:color/black</color>
-</resources>
diff --git a/res/values-night-v31/styles.xml b/res/values-night-v31/styles.xml
deleted file mode 100644
index 0bbda8997..000000000
--- a/res/values-night-v31/styles.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2021 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.
-  -->
-
-<resources>
-    <!--
-    <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon">
-        <item name="android:actionMenuTextColor">@*android:color/accent_device_default_dark</item>
-    </style>
-    -->
-
-    <style name="TabTextAppearance" parent="@android:style/TextAppearance.Material.Medium">
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-        <item name="android:textColor">?android:attr/colorAccent</item>
-    </style>
-
-    <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="android:backgroundTint">@android:color/transparent</item>
-        <item name="android:textColor">@*android:color/system_neutral1_100</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>
-    </style>
-</resources>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
deleted file mode 100644
index 9874d8a4c..000000000
--- a/res/values-night/colors.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-<resources>
-    <color name="app_background_color">#202124</color>
-    <color name="background_floating">#3C4043</color>
-    <color name="nav_bar_translucent">#52000000</color>
-
-    <color name="primary">#8AB4F8</color>
-    <color name="secondary">#3D8AB4F8</color>
-    <color name="hairline">#5F6368</color>
-
-    <color name="empty_state_text_color">@android:color/white</color>
-    <color name="error_image_color">@android:color/white</color>
-
-    <color name="edge_effect">@android:color/white</color>
-
-    <!-- AppCompat.textColorSecondary -->
-    <color name="doc_list_item_subtitle_enabled">#b3ffffff</color>
-    <color name="doc_list_item_subtitle_disabled">#36ffffff</color>
-
-    <color name="list_divider_color">#9aa0a6</color>
-    <color name="list_item_selected_background_color">?android:colorSecondary</color>
-
-    <color name="fragment_pick_active_text_color">#202124</color> <!-- Grey 900 -->
-
-    <color name="search_chip_text_selected_color">@android:color/black</color>
-</resources>
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
deleted file mode 100644
index 8ade73172..000000000
--- a/res/values-night/themes.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="LauncherTheme" parent="DocumentsTheme">
-        <item name="android:windowBackground">@drawable/launcher_screen_night</item>
-    </style>
-    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
-
-        <!-- Toolbar -->
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
-        <item name="android:actionBarSize">@dimen/action_bar_size</item>
-
-        <!-- Color section -->
-        <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorBackground">@color/app_background_color</item>
-        <item name="android:colorBackgroundFloating">@color/background_floating</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_dark</item>
-        <item name="android:colorControlActivated">@color/primary</item>
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorSecondary">@color/secondary</item>
-        <item name="android:strokeColor">@color/hairline</item>
-
-        <!-- System | Widget section -->
-        <item name="android:listDivider">@drawable/list_divider</item>
-        <item name="android:statusBarColor">?android:attr/colorBackground</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
-
-    </style>
-</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 642ff7e9a..000000000
--- a/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<resources>
-    <dimen name="root_icon_margin">8dp</dimen>
-</resources>
diff --git a/res/values-sw720dp/colors.xml b/res/values-sw720dp/colors.xml
deleted file mode 100644
index b39b89409..000000000
--- a/res/values-sw720dp/colors.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<resources>
-    <color name="menu_search_background">#ff2852ab</color>
-</resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
deleted file mode 100644
index 85c370ab9..000000000
--- a/res/values-sw720dp/dimens.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<resources>
-    <dimen name="grid_padding_horiz">16dp</dimen>
-    <dimen name="grid_padding_vert">16dp</dimen>
-
-    <dimen name="list_item_padding">24dp</dimen>
-    <dimen name="list_item_width">80dp</dimen>
-
-    <dimen name="max_drawer_width">320dp</dimen>
-
-    <dimen name="search_bar_background_margin_start">120dp</dimen>
-    <dimen name="search_bar_background_margin_end">120dp</dimen>
-    <dimen name="search_bar_text_margin_start">55dp</dimen>
-    <dimen name="search_bar_text_margin_end">24dp</dimen>
-    <dimen name="search_bar_icon_padding">16dp</dimen>
-</resources>
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
deleted file mode 100644
index 72de6e574..000000000
--- a/res/values-v31/colors.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- 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.
--->
-
-<resources>
-  <color name="tab_selected_text_color">@*android:color/system_neutral1_900
-  </color>
-  <!-- neutral 900 -->
-  <color name="tab_unselected_text_color">@*android:color/system_neutral2_700
-  </color>
-  <!-- neutral variant 700-->
-  <color name="work_profile_button_stroke_color">
-    @*android:color/system_accent1_600
-  </color> <!-- primary 600 -->
-  <color name="empty_state_text_color">@*android:color/system_neutral1_900
-  </color>
-  <!-- neutral 900 -->
-  <color name="empty_state_message_text_color">
-    @*android:color/system_neutral2_700
-  </color>
-  <!-- neutral variant 700 -->
-  <color name="profile_tab_selected_color">@*android:color/system_accent1_100
-  </color>
-  <!-- accent 100 -->
-  <color name="profile_tab_default_color">@*android:color/system_neutral1_10
-  </color>
-  <!-- neutral 10 -->
-  <color name="fragment_pick_inactive_button_color">
-    @*android:color/system_neutral1_100
-  </color>
-  <!-- neutral 100 -->
-  <color name="fragment_pick_inactive_text_color">
-    @*android:color/system_neutral1_400
-  </color>
-  <!-- neutral 400 -->
-  <color name="fragment_pick_active_button_color">@*android:color/system_accent1_600
-  </color>
-  <!-- accent 600 -->
-  <color name="fragment_pick_active_text_color">@android:color/white</color>
-</resources>
diff --git a/res/values-v31/dimens.xml b/res/values-v31/dimens.xml
deleted file mode 100644
index a4e39319a..000000000
--- a/res/values-v31/dimens.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  ~ Copyright (C) 2021 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.
-  -->
-<resources>
-    <dimen name="action_bar_elevation">0dp</dimen>
-    <dimen name="action_bar_margin">0dp</dimen>
-    <dimen name="button_corner_radius">20dp</dimen>
-    <dimen name="tab_selector_indicator_height">0dp</dimen>
-    <dimen name="tab_height">48dp</dimen>
-    <dimen name="tab_container_height">48dp</dimen>
-    <dimen name="profile_tab_padding">20dp</dimen>
-    <dimen name="profile_tab_margin_top">16dp</dimen>
-    <dimen name="profile_tab_margin_side">4dp</dimen>
-    <dimen name="cross_profile_button_corner_radius">30dp</dimen>
-    <dimen name="cross_profile_button_stroke_width">1dp</dimen>
-    <dimen name="cross_profile_button_message_margin_top">16dp</dimen>
-</resources>
diff --git a/res/values-v31/styles.xml b/res/values-v31/styles.xml
deleted file mode 100644
index c82ff5814..000000000
--- a/res/values-v31/styles.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2021 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.
-  -->
-
-<resources>
-
-  <style name="SectionHeader" parent="@android:style/TextAppearance.Material.Medium">
-    <item name="android:textColor">?android:attr/textColorPrimary</item>
-    <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    <item name="android:textSize">12sp</item>
-  </style>
-
-  <!--
-  <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon">
-    <item name="android:actionMenuTextColor">
-      @*android:color/accent_device_default_light
-    </item>
-  </style>
-  -->
-
-  <style name="MaterialButton" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">
-    <item name="android:textAppearance">@style/MaterialButtonTextAppearance
-    </item>
-    <item name="android:backgroundTint">?android:colorAccent</item>
-  </style>
-
-  <style name="MaterialOutlinedButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
-    <item name="android:textAppearance">@style/MaterialButtonTextAppearance
-    </item>
-    <item name="android:backgroundTint">@android:color/white</item>
-    <item name="android:textColor">?android:colorAccent</item>
-  </style>
-
-  <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
-    <item name="android:backgroundTint">@android:color/transparent</item>
-    <item name="android:textColor">@*android:color/system_neutral1_900</item>
-    <item name="android:textAllCaps">false</item>
-    <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance
-    </item>
-  </style>
-
-  <style name="DialogTextButton" parent="@style/Widget.MaterialComponents.Button.TextButton.Dialog">
-    <item name="android:textAppearance">@style/MaterialButtonTextAppearance
-    </item>
-    <item name="android:textColor">?android:attr/colorAccent</item>
-    <item name="android:backgroundTint">@android:color/transparent</item>
-  </style>
-</resources>
diff --git a/res/values-v31/styles_text.xml b/res/values-v31/styles_text.xml
deleted file mode 100644
index 02b91247b..000000000
--- a/res/values-v31/styles_text.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<resources>
-    <style name="EmptyStateTitleText">
-        <item name="android:textColor">@color/empty_state_text_color</item>
-        <item name="android:textSize">18sp</item>
-        <item name="fontFamily">@string/config_headerFontFamily</item>
-    </style>
-
-    <style name="EmptyStateMessageText">
-        <item name="android:textColor">@color/empty_state_message_text_color</item>
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
deleted file mode 100644
index 6ccaa6faf..000000000
--- a/res/values/colors.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- 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.
--->
-
-<resources>
-  <!-- This is the window background, but also the background for anything
-       else that needs to manually declare a background matching the "default"
-       app background (e.g. the drawer overlay). -->
-
-  <color name="app_background_color">@android:color/white</color>
-  <color name="background_floating">@android:color/white</color>
-  <color name="nav_bar_translucent">#99FFFFFF</color>
-
-  <color name="primary">#1E88E5</color> <!-- Blue 600 -->
-  <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
-  <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
-
-  <color name="chip_background_disable_color">#fff1f3f4</color>
-  <color name="menu_search_background">@android:color/transparent</color>
-  <color name="item_breadcrumb_background_hovered">#1affffff</color>
-  <color name="item_drag_shadow_background">@android:color/white</color>
-  <color name="item_drag_shadow_container_background">
-    @android:color/transparent
-  </color>
-  <color name="tool_bar_gradient_max">#7f000000</color>
-
-  <color name="band_select_background">#88ffffff</color>
-  <color name="band_select_border">#44000000</color>
-
-  <color name="downloads_icon_background">#ff4688f2</color>
-  <color name="app_icon_background">#ff4688f2</color>
-  <color name="shortcut_foreground">#ff3367d6</color>
-  <color name="shortcut_background">#fff5f5f5</color>
-
-  <color name="empty_state_text_color">#202124</color>
-  <color name="error_image_color">#757575</color>
-
-  <color name="edge_effect">@android:color/black</color>
-
-  <color name="doc_list_item_subtitle_enabled">#5F6368</color> <!-- Gray 700 -->
-  <color name="doc_list_item_subtitle_disabled">#613c4043
-  </color> <!-- 38% Grey800 -->
-
-  <color name="list_divider_color">#1f000000</color>
-  <color name="list_item_selected_background_color">?android:colorSecondary
-  </color>
-  <color name="color_surface_header">@color/app_background_color</color>
-
-  <color name="tab_selected_text_color">@color/primary</color>
-  <color name="work_profile_button_stroke_color">@color/primary</color>
-  <color name="profile_tab_selected_color">?android:attr/colorAccent</color>
-  <color name="profile_tab_default_color">#E0E0E0</color>
-  <color name="tab_unselected_text_color">#5F6368</color> <!-- Gray 700 -->
-
-  <color name="fragment_pick_inactive_button_color">#E0E0E0</color>
-  <color name="fragment_pick_inactive_text_color">#5F6368</color>
-  <color name="fragment_pick_active_button_color">@color/primary</color>
-  <color name="fragment_pick_active_text_color">@android:color/white</color>
-
-  <color name="search_chip_text_selected_color">@android:color/white</color>
-</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
deleted file mode 100644
index 037375385..000000000
--- a/res/values/dimens.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<resources>
-    <!-- Material design rounded radius -->
-    <dimen name="material_round_radius">2dp</dimen>
-
-    <dimen name="tab_selector_indicator_height">2dp</dimen>
-    <dimen name="profile_tab_padding">0dp</dimen>
-    <dimen name="grid_container_padding">20dp</dimen>
-    <dimen name="list_container_padding">0dp</dimen>
-    <dimen name="icon_size">40dp</dimen>
-    <dimen name="button_touch_size">48dp</dimen>
-    <dimen name="root_icon_size">24dp</dimen>
-    <dimen name="root_icon_margin">0dp</dimen>
-    <dimen name="root_spacer_padding">0dp</dimen>
-    <dimen name="root_action_icon_size">18dp</dimen>
-    <dimen name="root_icon_disabled_alpha">?android:attr/disabledAlpha</dimen>
-    <dimen name="check_icon_size">30dp</dimen>
-    <dimen name="zoom_icon_size">24dp</dimen>
-    <dimen name="list_item_thumbnail_size">40dp</dimen>
-    <dimen name="grid_item_icon_size">30dp</dimen>
-    <dimen name="progress_bar_height">4dp</dimen>
-    <fraction name="grid_scale_min">85%</fraction>
-    <fraction name="grid_scale_max">200%</fraction>
-    <dimen name="grid_width">152dp</dimen>
-    <dimen name="grid_section_separator_height">0dp</dimen>
-    <dimen name="grid_item_margin">6dp</dimen>
-    <dimen name="grid_padding_horiz">4dp</dimen>
-    <dimen name="grid_padding_vert">4dp</dimen>
-    <dimen name="list_item_width">72dp</dimen>
-    <dimen name="list_item_height">72dp</dimen>
-    <dimen name="list_item_padding">16dp</dimen>
-    <dimen name="list_item_icon_padding">16dp</dimen>
-    <dimen name="breadcrumb_item_padding">8dp</dimen>
-    <dimen name="breadcrumb_item_height">36dp</dimen>
-    <dimen name="list_divider_inset">72dp</dimen>
-    <dimen name="dir_elevation">8dp</dimen>
-    <dimen name="drag_shadow_size">120dp</dimen>
-    <dimen name="grid_item_elevation">2dp</dimen>
-    <dimen name="grid_item_radius">2dp</dimen>
-    <dimen name="max_drawer_width">280dp</dimen>
-    <dimen name="briefcase_icon_margin">8dp</dimen>
-    <dimen name="briefcase_icon_size">14dp</dimen>
-    <dimen name="briefcase_icon_size_photo">24dp</dimen>
-    <dimen name="button_corner_radius">2dp</dimen>
-
-    <dimen name="drawer_edge_width">12dp</dimen>
-
-    <dimen name="drag_shadow_width">176dp</dimen>
-    <dimen name="drag_shadow_height">64dp</dimen>
-    <dimen name="drag_shadow_radius">4dp</dimen>
-    <dimen name="drag_shadow_padding">8dp</dimen>
-
-    <dimen name="doc_header_sort_icon_size">16dp</dimen>
-    <dimen name="doc_header_height">60dp</dimen>
-
-    <dimen name="dropdown_sort_widget_margin">12dp</dimen>
-    <dimen name="dropdown_sort_widget_size">54dp</dimen>
-    <dimen name="dropdown_sort_text_size">18sp</dimen>
-
-    <dimen name="drop_icon_height">14dp</dimen>
-    <dimen name="drop_icon_width">14dp</dimen>
-
-    <dimen name="header_message_horizontal_padding">8dp</dimen>
-
-    <dimen name="fastscroll_default_thickness">8dp</dimen>
-    <dimen name="fastscroll_minimum_range">50dp</dimen>
-    <dimen name="fastscroll_margin">0dp</dimen>
-
-    <dimen name="bottom_bar_height">56dp</dimen>
-    <dimen name="bottom_bar_padding">10dp</dimen>
-    <dimen name="bottom_bar_button_height">36dip</dimen>
-    <dimen name="bottom_bar_button_horizontal_padding">24dp</dimen>
-    <dimen name="bottom_bar_button_corner_radius">4dp</dimen>
-
-    <dimen name="inspector_header_height">280dp</dimen>
-
-    <dimen name="root_info_header_height">60dp</dimen>
-    <dimen name="root_info_header_horizontal_padding">24dp</dimen>
-
-    <dimen name="search_chip_group_margin">20dp</dimen>
-    <dimen name="search_chip_spacing">8dp</dimen>
-    <dimen name="search_chip_half_spacing">4dp</dimen>
-    <dimen name="search_chip_icon_padding">4dp</dimen>
-    <dimen name="search_chip_radius">16dp</dimen>
-
-    <dimen name="dialog_content_padding_top">18dp</dimen>
-    <dimen name="dialog_content_padding_bottom">24dp</dimen>
-
-    <dimen name="apps_row_title_height">48dp</dimen>
-    <dimen name="apps_row_title_padding_start">24dp</dimen>
-    <dimen name="apps_row_item_width">92dp</dimen>
-    <dimen name="apps_row_item_height">82dp</dimen>
-    <dimen name="apps_row_app_icon_size">32dp</dimen>
-    <dimen name="apps_row_app_icon_margin_horizontal">30dp</dimen>
-    <dimen name="apps_row_app_icon_margin_top">6dp</dimen>
-    <dimen name="apps_row_app_icon_margin_bottom">10dp</dimen>
-    <dimen name="apps_row_exit_icon_size">12dp</dimen>
-    <dimen name="apps_row_exit_icon_margin_top">2dp</dimen>
-    <dimen name="apps_row_exit_icon_margin_bottom">6dp</dimen>
-    <dimen name="apps_row_item_text_margin_horizontal">8dp</dimen>
-
-    <dimen name="search_bar_elevation">3dp</dimen>
-    <dimen name="search_bar_radius">8dp</dimen>
-    <dimen name="search_bar_background_margin_start">0dp</dimen>
-    <dimen name="search_bar_background_margin_end">0dp</dimen>
-    <dimen name="search_bar_margin">8dp</dimen>
-    <dimen name="search_bar_text_size">16dp</dimen>
-
-    <dimen name="action_bar_elevation">3dp</dimen>
-    <dimen name="action_bar_margin">1dp</dimen>
-    <dimen name="action_bar_size">48dp</dimen>
-    <dimen name="action_mode_text_size">18sp</dimen>
-
-    <dimen name="refresh_icon_range">64dp</dimen>
-
-    <dimen name="item_doc_inflated_message_padding_top">0dp</dimen>
-    <dimen name="cross_profile_button_corner_radius">0dp</dimen>
-    <dimen name="cross_profile_button_stroke_width">0dp</dimen>
-    <dimen name="cross_profile_button_message_margin_top">4dp</dimen>
-</resources>
diff --git a/res/values/layouts.xml b/res/values/layouts.xml
deleted file mode 100644
index a60ce87ba..000000000
--- a/res/values/layouts.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<resources>
-    <item name="documents_activity" type="layout">@layout/drawer_layout</item>
-    <item name="files_activity" type="layout">@layout/drawer_layout</item>
-</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
deleted file mode 100644
index 1efd1d5d1..000000000
--- a/res/values/styles.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="ActionBarThemeCommon" parent="@style/ThemeOverlay.AppCompat.ActionBar">
-        <item name="colorControlNormal">?android:textColorSecondary</item>
-        <!-- Modern platform themes set actionMenuTextColor to textColorPrimary. For example,
-             see Theme.Material in frameworks/base/core/res/res/values/themes_material.xml.
-             However, if the platform theme does not set actionMenuTextColor we are going to
-             crash, so let's set it here. Additionally, most of our ActionBarTheme themes
-             override this -->
-        <item name="android:actionMenuTextColor">?android:textColorPrimary</item>
-        <item name="android:textAllCaps">false</item>
-    </style>
-
-    <!-- This gets overridden for specific platform versions and/or configs -->
-    <style name="ActionBarTheme" parent="@style/ActionBarThemeCommon"/>
-
-    <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
-        <!-- attr "height" was used by support lib should not in overlay scope -->
-        <item name="height">@dimen/action_bar_size</item>
-        <item name="titleTextStyle">@style/ActionModeTitle</item>
-        <item name="android:layout_margin">@dimen/search_bar_margin</item>
-    </style>
-
-    <style name="CardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
-        <item name="cardBackgroundColor">@color/app_background_color</item>
-        <item name="cardPreventCornerOverlap">false</item>
-        <item name="cardCornerRadius">@dimen/grid_item_radius</item>
-        <item name="cardElevation">@dimen/grid_item_elevation</item>
-    </style>
-
-    <style name="TrimmedHorizontalProgressBar" parent="android:Widget.Material.ProgressBar.Horizontal">
-        <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_material_trimmed</item>
-        <item name="android:minHeight">3dp</item>
-        <item name="android:maxHeight">3dp</item>
-    </style>
-
-    <style name="SnackbarButtonStyle" parent="@style/Widget.AppCompat.Button.Borderless">
-        <item name="android:textColor">?android:colorPrimary</item>
-    </style>
-
-    <style name="AutoCompleteTextViewStyle" parent="@style/Widget.AppCompat.AutoCompleteTextView">
-        <item name="android:textColorHint">?android:attr/textColorSecondary</item>
-        <item name="android:textAppearance">@style/AutoCompleteText</item>
-    </style>
-
-    <style name="BottomSheetDialogStyle" parent="@style/ThemeOverlay.MaterialComponents.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="bottomSheetStyle">@style/BottomSheet</item>
-        <item name="colorControlHighlight">@color/ripple_material_light</item>
-    </style>
-
-    <style name="BottomSheet" parent="@style/Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@drawable/bottom_sheet_dialog_background</item>
-    </style>
-
-    <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">?android:colorControlNormal</item>
-        <item name="android:minWidth">@dimen/button_touch_size</item>
-    </style>
-
-    <style name="OverflowMenuStyle" parent="@style/Widget.AppCompat.PopupMenu.Overflow">
-        <item name="android:popupBackground">@drawable/menu_dropdown_panel</item>
-        <item name="android:dropDownWidth">wrap_content</item>
-        <item name="android:overlapAnchor">false</item>
-    </style>
-
-    <style name="MaterialAlertDialogTitleStyle" parent="@style/MaterialAlertDialog.MaterialComponents.Title.Text.CenterStacked">
-        <item name="android:textColor">?attr/colorOnSurface</item>
-        <item name="android:textSize">20sp</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-    
-    <style name="MaterialButton" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">
-        <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>
-    </style>
-
-    <style name="MaterialOutlinedButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>
-    </style>
-
-    <style name="DialogTextButton" parent="@style/Widget.MaterialComponents.Button.TextButton.Dialog">
-        <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>
-        <item name="android:textColor">?android:attr/colorAccent</item>
-    </style>
-
-    <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.TextButton">
-        <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>
-    </style>
-
-    <style name="AlertDialogTheme" parent="@style/ThemeOverlay.AppCompat.Dialog.Alert">
-        <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>
-        <item name="buttonBarNegativeButtonStyle">@style/DialogTextButton</item>
-    </style>
-
-    <style name="MaterialAlertDialogStyle" parent="@style/MaterialAlertDialog.MaterialComponents">
-        <item name="backgroundInsetTop">12dp</item>
-        <item name="backgroundInsetBottom">12dp</item>
-    </style>
-
-    <style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog.Centered">
-        <item name="android:dialogCornerRadius">@dimen/grid_item_radius</item>
-        <item name="alertDialogStyle">@style/MaterialAlertDialogStyle</item>
-        <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>
-        <item name="buttonBarNegativeButtonStyle">@style/DialogTextButton</item>
-        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialogTitleStyle</item>
-    </style>
-</resources>
diff --git a/res/values/styles_text.xml b/res/values/styles_text.xml
deleted file mode 100644
index 084480c2c..000000000
--- a/res/values/styles_text.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<resources>
-    <style name="SortTitle" parent="@style/TextAppearance.MaterialComponents.Headline6">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textSize">11sp</item>
-    </style>
-
-    <style name="SectionHeader" parent="@android:style/TextAppearance.Material.Medium">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="SortList" parent="@style/TextAppearance.AppCompat.Subhead">
-        <item name="android:textColor">@color/sort_list_text</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-
-    <style name="SearchBarTitle" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textSize">@dimen/search_bar_text_size</item>
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-
-    <style name="SearchChipText">
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-
-    <style name="AppsItemText">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textSize">12sp</item>
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-
-    <style name="AppsItemSubText">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textSize">11sp</item>
-    </style>
-
-    <style name="AutoCompleteText" parent="@style/TextAppearance.AppCompat.Medium">
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-
-    <style name="CardPrimaryText" parent="@style/TextAppearance.AppCompat.Subhead">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-
-    <style name="ActionModeTitle" parent="@style/ToolbarTitle">
-        <item name="android:textSize">@dimen/action_mode_text_size</item>
-    </style>
-
-    <style name="ToolbarTitle" parent="@android:style/TextAppearance.Material.Title">
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-
-    <style name="DrawerMenuTitle" parent="@android:style/TextAppearance.Material.Title">
-        <item name="android:textSize">24sp</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-
-    <style name="DrawerMenuHeader" parent="@android:style/TextAppearance.Material.Subhead">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">11sp</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-
-    <style name="DrawerMenuPrimary" parent="android:style/TextAppearance.Material.Body2">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/item_root_primary_text</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-
-    <style name="DrawerMenuSecondary" parent="android:style/TextAppearance.Material.Body2">
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">@color/item_root_secondary_text</item>
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-
-    <style name="InspectorKeySubTitle" parent="@style/TextAppearance.MaterialComponents.Subtitle1">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-    </style>
-
-    <style name="MaterialButtonTextAppearance" parent="@style/TextAppearance.MaterialComponents.Button">
-        <item name="android:textAllCaps">@bool/config_button_all_caps</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-
-    <style name="BreadcrumbText" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
-        <item name="android:textColor">@color/horizontal_breadcrumb_color</item>
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-
-    <style name="EmptyStateTitleText">
-        <item name="android:textColor">@color/empty_state_text_color</item>
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-
-    <style name="EmptyStateMessageText">
-        <item name="android:textColor">@color/empty_state_text_color</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="EmptyStateButtonTextAppearance">
-        <item name="android:textColor">?android:attr/colorAccent</item>
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-
-    <style name="TabTextAppearance" parent="@android:style/TextAppearance.Material.Medium">
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamilyMedium</item>
-    </style>
-
-    <style name="ItemCaptionText" parent="@android:style/TextAppearance.Material.Caption">
-        <item name="android:textColor">@color/doc_list_item_subtitle_color</item>
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-
-    <style name="MenuItemTextAppearance" parent="@android:style/TextAppearance.Material.Body2">
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-
-    <style name="Subhead" parent="@android:style/TextAppearance.Material.Subhead">
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-
-    <style name="Body1" parent="@android:style/TextAppearance.Material.Body1">
-        <item name="fontFamily">@string/config_fontFamily</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
deleted file mode 100644
index d6e3af0fe..000000000
--- a/res/values/themes.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<resources>
-    <style name="LauncherTheme" parent="DocumentsTheme">
-        <item name="android:windowBackground">@drawable/launcher_screen</item>
-    </style>
-    <!-- DocumentsTheme is allow customize by run time overlay -->
-    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
-
-        <item name="android:actionBarSize">@dimen/action_bar_size</item>
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
-
-        <!-- Color section -->
-        <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorBackground">@android:color/white</item>
-        <item name="android:colorBackgroundFloating">@color/background_floating</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_light</item>
-        <item name="android:colorControlActivated">@color/primary</item>
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorSecondary">@color/secondary</item>
-        <item name="android:strokeColor">@color/hairline</item>
-
-        <!-- System | Widget section -->
-        <item name="android:listDivider">@drawable/list_divider</item>
-        <item name="android:statusBarColor">?android:colorBackground</item>
-        <item name="android:navigationBarColor">?android:colorBackground</item>
-        <item name="android:windowBackground">?android:colorBackground</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
-
-        <!-- OEM should not overlay this attr -->
-        <item name="android:windowNoTitle">true</item>
-
-    </style>
-
-    <style name="DocumentsDefaultTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
-
-        <!-- This only used by support lib, not allow to overlay -->
-        <item name="windowActionBar">false</item>
-        <item name="windowActionModeOverlay">true</item>
-
-        <!-- For material design widget, chips, buttons, not support attr-->
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorAccent">@color/primary</item>
-
-        <!-- TODO need to solve the error handle in GridItemThumbnail -->
-        <item name="gridItemTint">@color/item_doc_grid_tint</item>
-
-        <item name="actionBarTheme">@style/ActionBarTheme</item>
-        <item name="actionModeStyle">@style/ActionModeStyle</item>
-        <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
-        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
-        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
-        <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>
-        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogStyle</item>
-        <item name="materialButtonStyle">@style/MaterialButton</item>
-        <item name="materialButtonOutlinedStyle">@style/MaterialOutlinedButton</item>
-        <item name="materialCardViewStyle">@style/CardViewStyle</item>
-        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
-        <item name="queryBackground">@color/menu_search_background</item>
-        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
-        <item name="android:itemTextAppearance">@style/MenuItemTextAppearance</item>
-    </style>
-
-    <!-- Theme used for Material 3 uplift, hidden behind the use_material3 flag. -->
-    <style name="DocumentsDefaultM3Theme" parent="@style/Theme.Material3.DynamicColors.DayNight.NoActionBar">
-
-        <!-- This only used by support lib, not allow to overlay -->
-        <item name="windowActionBar">false</item>
-        <item name="windowActionModeOverlay">true</item>
-
-        <!-- For material design widget, chips, buttons, not support attr-->
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorAccent">@color/primary</item>
-
-        <!-- TODO need to solve the error handle in GridItemThumbnail -->
-        <item name="gridItemTint">@color/item_doc_grid_tint</item>
-
-        <item name="actionBarTheme">@style/ActionBarTheme</item>
-        <item name="actionModeStyle">@style/ActionModeStyle</item>
-        <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
-        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
-        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
-        <item name="autoCompleteTextViewStyle">@style/AutoCompleteTextViewStyle</item>
-        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogStyle</item>
-        <item name="materialButtonStyle">@style/MaterialButton</item>
-        <item name="materialButtonOutlinedStyle">@style/MaterialOutlinedButton</item>
-        <item name="materialCardViewStyle">@style/CardViewStyle</item>
-        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
-        <item name="queryBackground">@color/menu_search_background</item>
-        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>
-        <item name="android:itemTextAppearance">@style/MenuItemTextAppearance</item>
-    </style>
-
-    <style name="TabTheme" parent="@android:style/Theme.DeviceDefault.DayNight">
-        <item name="colorPrimary">@color/edge_effect</item>
-    </style>
-</resources>
-- 
cgit v1.2.3-59-g8ed1b