From f077a15192c9c65bb51e04c7d556ce3f6c630b0e Mon Sep 17 00:00:00 2001 From: Fahim Date: Sat, 14 Aug 2021 16:55:12 +0600 Subject: [PATCH 1/3] 3269-Q-Dark-mode_implementation issue: https://gitlab.e.foundation/e/backlog/-/issues/3269 --- res/color/item_doc_grid_border.xml | 4 +- res/color/item_doc_grid_tint.xml | 2 +- res/color/item_root_primary_text.xml | 8 +-- res/color/item_root_secondary_text.xml | 8 +-- res/color/search_chip_background_color.xml | 6 +-- res/color/search_chip_ripple_color.xml | 10 ++-- res/color/search_chip_stroke_color.xml | 2 +- res/color/search_chip_text_color.xml | 2 +- res/drawable/breadcrumb_item_background.xml | 2 +- res/drawable/check_textview_text_color.xml | 5 ++ res/drawable/circle_button_background.xml | 2 +- .../dropdown_sort_widget_background.xml | 2 +- res/drawable/empty.xml | 12 ++--- res/drawable/generic_ripple_background.xml | 2 +- res/drawable/grid_item_background.xml | 4 +- res/drawable/ic_action_clear.xml | 4 +- res/drawable/ic_action_open.xml | 2 +- res/drawable/ic_arrow_back.xml | 2 +- res/drawable/ic_arrow_upward.xml | 2 +- res/drawable/ic_breadcrumb_arrow.xml | 2 +- res/drawable/ic_cab_cancel.xml | 2 +- res/drawable/ic_check.xml | 3 +- res/drawable/ic_check_circle.xml | 4 +- res/drawable/ic_debug_menu.xml | 4 +- res/drawable/ic_dialog_alert.xml | 2 +- res/drawable/ic_dialog_info.xml | 2 +- res/drawable/ic_done.xml | 2 +- res/drawable/ic_drop_copy_badge.xml | 2 +- res/drawable/ic_eject.xml | 2 +- res/drawable/ic_exit_to_app.xml | 2 +- res/drawable/ic_hamburger.xml | 2 +- res/drawable/ic_history.xml | 2 +- res/drawable/ic_menu_compress.xml | 2 +- res/drawable/ic_menu_copy.xml | 2 +- res/drawable/ic_menu_delete.xml | 2 +- res/drawable/ic_menu_extract.xml | 2 +- res/drawable/ic_menu_search.xml | 4 +- res/drawable/ic_menu_share.xml | 2 +- res/drawable/ic_menu_view_grid.xml | 2 +- res/drawable/ic_menu_view_list.xml | 2 +- res/drawable/ic_more_24.xml | 10 ++++ res/drawable/ic_reject_drop_badge.xml | 2 +- res/drawable/ic_sd_storage.xml | 2 +- res/drawable/ic_subdirectory_arrow.xml | 2 +- res/drawable/ic_usb_storage.xml | 2 +- res/drawable/ic_user_profile.xml | 2 +- res/drawable/ic_zoom_out.xml | 2 +- res/drawable/inspector_separator.xml | 4 +- res/drawable/item_doc_grid_border.xml | 2 +- res/drawable/item_doc_grid_border_rounded.xml | 2 +- res/drawable/list_divider.xml | 2 +- res/drawable/list_item_background.xml | 8 +-- res/drawable/menu_dropdown_panel.xml | 4 +- res/drawable/root_item_background.xml | 2 +- res/drawable/root_list_selector.xml | 2 +- res/drawable/search_bar_background.xml | 2 +- res/drawable/selection_demo_band_overlay.xml | 4 +- res/drawable/sort_widget_background.xml | 2 +- res/layout-sw720dp/directory_app_bar.xml | 2 +- res/layout/dialog_file_name.xml | 5 +- res/layout/dialog_sorting.xml | 1 + res/layout/directory_app_bar.xml | 5 +- res/layout/drawer_layout.xml | 4 +- res/layout/fixed_layout.xml | 2 +- res/layout/fragment_search.xml | 1 + res/layout/inspector_activity.xml | 6 ++- res/layout/item_doc_grid.xml | 4 +- res/layout/item_doc_header_message.xml | 3 ++ res/layout/item_photo_grid.xml | 4 +- res/layout/item_root_spacer.xml | 1 + res/layout/search_chip_item.xml | 2 +- res/layout/sort_list_item.xml | 1 + .../themes.xml} | 13 ++++- res/values-night/themes.xml | 45 ---------------- .../colors.xml => values-v27/themes.xml} | 18 ++++--- res/values/colors.xml | 54 +++++++++---------- res/values/styles.xml | 20 ++++--- res/values/themes.xml | 48 +++++++++++------ .../documentsui/AbstractActionHandler.java | 5 +- src/com/android/documentsui/BaseActivity.java | 6 +-- .../android/documentsui/DrawerController.java | 3 +- .../documentsui/GridItemThumbnail.java | 2 +- src/com/android/documentsui/IconUtils.java | 5 +- .../dirlist/DocumentsSwipeRefreshLayout.java | 4 +- .../dirlist/GridDirectoryHolder.java | 6 +-- .../dirlist/ListDocumentHolder.java | 6 +-- .../documentsui/files/FilesActivity.java | 2 +- .../inspector/InspectorActivity.java | 4 +- .../documentsui/picker/PickActivity.java | 2 +- src/com/android/documentsui/ui/Snackbars.java | 11 +++- .../documentsui/ui/DarkThemeUiTest.java | 6 +-- 91 files changed, 253 insertions(+), 234 deletions(-) create mode 100644 res/drawable/check_textview_text_color.xml create mode 100644 res/drawable/ic_more_24.xml rename res/{values-sw720dp/colors.xml => values-night-v27/themes.xml} (53%) delete mode 100644 res/values-night/themes.xml rename res/{values-night/colors.xml => values-v27/themes.xml} (53%) diff --git a/res/color/item_doc_grid_border.xml b/res/color/item_doc_grid_border.xml index b535aedc3..89235b4bb 100644 --- a/res/color/item_doc_grid_border.xml +++ b/res/color/item_doc_grid_border.xml @@ -18,10 +18,10 @@ + android:color="@color/accent"/> + android:color="@color/accent"/> diff --git a/res/color/item_doc_grid_tint.xml b/res/color/item_doc_grid_tint.xml index 2c48e9658..fe0d36b8c 100644 --- a/res/color/item_doc_grid_tint.xml +++ b/res/color/item_doc_grid_tint.xml @@ -17,7 +17,7 @@ diff --git a/res/color/item_root_primary_text.xml b/res/color/item_root_primary_text.xml index 62a620c85..62e90d94c 100644 --- a/res/color/item_root_primary_text.xml +++ b/res/color/item_root_primary_text.xml @@ -15,8 +15,8 @@ --> - - - - + + + + diff --git a/res/color/item_root_secondary_text.xml b/res/color/item_root_secondary_text.xml index 44086ef88..db7cb3daf 100644 --- a/res/color/item_root_secondary_text.xml +++ b/res/color/item_root_secondary_text.xml @@ -16,8 +16,8 @@ --> - - - - + + + + diff --git a/res/color/search_chip_background_color.xml b/res/color/search_chip_background_color.xml index 538a2d46b..6450a23d6 100644 --- a/res/color/search_chip_background_color.xml +++ b/res/color/search_chip_background_color.xml @@ -16,8 +16,8 @@ --> - - - + + + \ No newline at end of file diff --git a/res/color/search_chip_ripple_color.xml b/res/color/search_chip_ripple_color.xml index 8d785253c..39e3830f6 100644 --- a/res/color/search_chip_ripple_color.xml +++ b/res/color/search_chip_ripple_color.xml @@ -18,15 +18,15 @@ + android:alpha="0.16" android:color="@color/accent"/> + android:alpha="0.16" android:color="@color/accent"/> + android:alpha="0.12" android:color="@color/accent"/> + android:alpha="0.04" android:color="@color/accent"/> + android:alpha="0.00" android:color="@color/accent"/> diff --git a/res/color/search_chip_stroke_color.xml b/res/color/search_chip_stroke_color.xml index 2da736358..7ad45e8be 100644 --- a/res/color/search_chip_stroke_color.xml +++ b/res/color/search_chip_stroke_color.xml @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/res/color/search_chip_text_color.xml b/res/color/search_chip_text_color.xml index 0457ba25a..b7c13e91e 100644 --- a/res/color/search_chip_text_color.xml +++ b/res/color/search_chip_text_color.xml @@ -16,7 +16,7 @@ --> - + \ No newline at end of file diff --git a/res/drawable/breadcrumb_item_background.xml b/res/drawable/breadcrumb_item_background.xml index 410e8edb9..8005bcf3f 100644 --- a/res/drawable/breadcrumb_item_background.xml +++ b/res/drawable/breadcrumb_item_background.xml @@ -20,7 +20,7 @@ android:color="?attr/colorControlHighlight"> + android:drawable="@color/color_default_background"/> diff --git a/res/drawable/check_textview_text_color.xml b/res/drawable/check_textview_text_color.xml new file mode 100644 index 000000000..cb30ea2fc --- /dev/null +++ b/res/drawable/check_textview_text_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/circle_button_background.xml b/res/drawable/circle_button_background.xml index d5b3c50d1..8ff3a1968 100644 --- a/res/drawable/circle_button_background.xml +++ b/res/drawable/circle_button_background.xml @@ -17,5 +17,5 @@ + android:color="@color/color_default_background"/> \ No newline at end of file diff --git a/res/drawable/dropdown_sort_widget_background.xml b/res/drawable/dropdown_sort_widget_background.xml index a1a74e787..8c208ec1e 100644 --- a/res/drawable/dropdown_sort_widget_background.xml +++ b/res/drawable/dropdown_sort_widget_background.xml @@ -19,5 +19,5 @@ android:color="?attr/colorControlHighlight" > + android:drawable="@color/color_default_background"/> diff --git a/res/drawable/empty.xml b/res/drawable/empty.xml index 73d4ffd2a..bb37849ab 100644 --- a/res/drawable/empty.xml +++ b/res/drawable/empty.xml @@ -20,13 +20,13 @@ Copyright (C) 2018 The Android Open Source Project android:viewportHeight="210"> diff --git a/res/drawable/generic_ripple_background.xml b/res/drawable/generic_ripple_background.xml index edf52c404..bc3aa1d37 100644 --- a/res/drawable/generic_ripple_background.xml +++ b/res/drawable/generic_ripple_background.xml @@ -20,7 +20,7 @@ - + \ No newline at end of file diff --git a/res/drawable/grid_item_background.xml b/res/drawable/grid_item_background.xml index 9c4e644a8..7deb062ef 100644 --- a/res/drawable/grid_item_background.xml +++ b/res/drawable/grid_item_background.xml @@ -16,10 +16,10 @@ - + - + diff --git a/res/drawable/ic_action_clear.xml b/res/drawable/ic_action_clear.xml index 38588b9bc..1e24dad71 100644 --- a/res/drawable/ic_action_clear.xml +++ b/res/drawable/ic_action_clear.xml @@ -18,8 +18,8 @@ Copyright (C) 2017 The Android Open Source Project android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal" > + android:tint="@color/accent" > \ No newline at end of file diff --git a/res/drawable/ic_action_open.xml b/res/drawable/ic_action_open.xml index 15890c948..85f09aa8b 100644 --- a/res/drawable/ic_action_open.xml +++ b/res/drawable/ic_action_open.xml @@ -19,6 +19,6 @@ Copyright (C) 201 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml index 1a9993033..a8b601c59 100644 --- a/res/drawable/ic_arrow_back.xml +++ b/res/drawable/ic_arrow_back.xml @@ -20,6 +20,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/ic_arrow_upward.xml b/res/drawable/ic_arrow_upward.xml index dab39f9a3..dfef6d9c5 100644 --- a/res/drawable/ic_arrow_upward.xml +++ b/res/drawable/ic_arrow_upward.xml @@ -23,6 +23,6 @@ \ No newline at end of file diff --git a/res/drawable/ic_breadcrumb_arrow.xml b/res/drawable/ic_breadcrumb_arrow.xml index f13be0f28..7f3f4ab13 100644 --- a/res/drawable/ic_breadcrumb_arrow.xml +++ b/res/drawable/ic_breadcrumb_arrow.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_cab_cancel.xml b/res/drawable/ic_cab_cancel.xml index 1eae40e5f..d0e056690 100644 --- a/res/drawable/ic_cab_cancel.xml +++ b/res/drawable/ic_cab_cancel.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_check.xml b/res/drawable/ic_check.xml index a6df08a93..d8b9aec38 100644 --- a/res/drawable/ic_check.xml +++ b/res/drawable/ic_check.xml @@ -17,8 +17,7 @@ Copyright (C) 2018 The Android Open Source Project android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorPrimary"> + android:viewportHeight="24.0" > diff --git a/res/drawable/ic_check_circle.xml b/res/drawable/ic_check_circle.xml index 192da29e6..f04dca0ae 100644 --- a/res/drawable/ic_check_circle.xml +++ b/res/drawable/ic_check_circle.xml @@ -18,9 +18,9 @@ Copyright (C) 2016 The Android Open Source Project android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="@color/color_default_blue1" + android:tint="@color/accent" > diff --git a/res/drawable/ic_debug_menu.xml b/res/drawable/ic_debug_menu.xml index f0ada107b..b93842c1a 100644 --- a/res/drawable/ic_debug_menu.xml +++ b/res/drawable/ic_debug_menu.xml @@ -6,8 +6,8 @@ This file has no copyright assigned and is placed in the Public Domain. android:width="24dp" android:viewportHeight="399.0" android:viewportWidth="425.8"> - - \ No newline at end of file diff --git a/res/drawable/ic_dialog_alert.xml b/res/drawable/ic_dialog_alert.xml index 8066483e5..674d51207 100644 --- a/res/drawable/ic_dialog_alert.xml +++ b/res/drawable/ic_dialog_alert.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_dialog_info.xml b/res/drawable/ic_dialog_info.xml index f1593516b..adf79b893 100644 --- a/res/drawable/ic_dialog_info.xml +++ b/res/drawable/ic_dialog_info.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_done.xml b/res/drawable/ic_done.xml index f8f66b692..3ce93251d 100644 --- a/res/drawable/ic_done.xml +++ b/res/drawable/ic_done.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_drop_copy_badge.xml b/res/drawable/ic_drop_copy_badge.xml index 7f1be3151..0edff44c7 100644 --- a/res/drawable/ic_drop_copy_badge.xml +++ b/res/drawable/ic_drop_copy_badge.xml @@ -31,7 +31,7 @@ Copyright (C) 2016 The Android Open Source Project android:translateX="2" android:translateY="2"> diff --git a/res/drawable/ic_eject.xml b/res/drawable/ic_eject.xml index 0e1b36f33..17bc93285 100644 --- a/res/drawable/ic_eject.xml +++ b/res/drawable/ic_eject.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/ic_exit_to_app.xml b/res/drawable/ic_exit_to_app.xml index b597def5b..7304387f0 100644 --- a/res/drawable/ic_exit_to_app.xml +++ b/res/drawable/ic_exit_to_app.xml @@ -19,6 +19,6 @@ Copyright (C) 2018 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml index 2ab5fd9e0..f623d2f42 100644 --- a/res/drawable/ic_hamburger.xml +++ b/res/drawable/ic_hamburger.xml @@ -22,6 +22,6 @@ android:tint="@color/accent" > \ No newline at end of file diff --git a/res/drawable/ic_history.xml b/res/drawable/ic_history.xml index df0636dee..ba197a028 100644 --- a/res/drawable/ic_history.xml +++ b/res/drawable/ic_history.xml @@ -19,6 +19,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_menu_compress.xml b/res/drawable/ic_menu_compress.xml index cdb328e82..130b6e068 100644 --- a/res/drawable/ic_menu_compress.xml +++ b/res/drawable/ic_menu_compress.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_menu_copy.xml b/res/drawable/ic_menu_copy.xml index 9c391dae2..0e54221d1 100644 --- a/res/drawable/ic_menu_copy.xml +++ b/res/drawable/ic_menu_copy.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_menu_delete.xml b/res/drawable/ic_menu_delete.xml index bfe3ed64f..ed53870c7 100644 --- a/res/drawable/ic_menu_delete.xml +++ b/res/drawable/ic_menu_delete.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_menu_extract.xml b/res/drawable/ic_menu_extract.xml index 7770148c5..13461a657 100644 --- a/res/drawable/ic_menu_extract.xml +++ b/res/drawable/ic_menu_extract.xml @@ -22,7 +22,7 @@ \ No newline at end of file diff --git a/res/drawable/ic_menu_search.xml b/res/drawable/ic_menu_search.xml index d3a787112..8fe165823 100644 --- a/res/drawable/ic_menu_search.xml +++ b/res/drawable/ic_menu_search.xml @@ -19,9 +19,9 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="@color/color_default_primary_text" + android:tint="@color/accent" > \ No newline at end of file diff --git a/res/drawable/ic_menu_share.xml b/res/drawable/ic_menu_share.xml index 5ff5c8635..82a419d19 100644 --- a/res/drawable/ic_menu_share.xml +++ b/res/drawable/ic_menu_share.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_menu_view_grid.xml b/res/drawable/ic_menu_view_grid.xml index 4279bfedf..9cbcdc500 100644 --- a/res/drawable/ic_menu_view_grid.xml +++ b/res/drawable/ic_menu_view_grid.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_menu_view_list.xml b/res/drawable/ic_menu_view_list.xml index 7428c55fe..264faa47c 100644 --- a/res/drawable/ic_menu_view_list.xml +++ b/res/drawable/ic_menu_view_list.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_more_24.xml b/res/drawable/ic_more_24.xml new file mode 100644 index 000000000..4d8bd7022 --- /dev/null +++ b/res/drawable/ic_more_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_reject_drop_badge.xml b/res/drawable/ic_reject_drop_badge.xml index 402aff8f8..e435e3dab 100644 --- a/res/drawable/ic_reject_drop_badge.xml +++ b/res/drawable/ic_reject_drop_badge.xml @@ -32,7 +32,7 @@ Copyright (C) 2016 The Android Open Source Project android:translateX="2" android:translateY="2"> diff --git a/res/drawable/ic_sd_storage.xml b/res/drawable/ic_sd_storage.xml index 8d9e4a671..179690a68 100644 --- a/res/drawable/ic_sd_storage.xml +++ b/res/drawable/ic_sd_storage.xml @@ -19,6 +19,6 @@ Copyright (C) 2015 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_subdirectory_arrow.xml b/res/drawable/ic_subdirectory_arrow.xml index 35f5ca59e..f20f720f0 100644 --- a/res/drawable/ic_subdirectory_arrow.xml +++ b/res/drawable/ic_subdirectory_arrow.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_usb_storage.xml b/res/drawable/ic_usb_storage.xml index 60cb6c27f..42ce27949 100644 --- a/res/drawable/ic_usb_storage.xml +++ b/res/drawable/ic_usb_storage.xml @@ -19,6 +19,6 @@ Copyright (C) 2015 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_user_profile.xml b/res/drawable/ic_user_profile.xml index 42e06a59e..41915d535 100644 --- a/res/drawable/ic_user_profile.xml +++ b/res/drawable/ic_user_profile.xml @@ -5,5 +5,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> \ No newline at end of file diff --git a/res/drawable/ic_zoom_out.xml b/res/drawable/ic_zoom_out.xml index 295054a35..0b10942aa 100644 --- a/res/drawable/ic_zoom_out.xml +++ b/res/drawable/ic_zoom_out.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/inspector_separator.xml b/res/drawable/inspector_separator.xml index cbb494a1d..d26192e48 100644 --- a/res/drawable/inspector_separator.xml +++ b/res/drawable/inspector_separator.xml @@ -17,8 +17,8 @@ android:insetTop="10dp" android:insetBottom="10dp" > + android:tint="@color/color_default_divider"> - + \ No newline at end of file diff --git a/res/drawable/item_doc_grid_border.xml b/res/drawable/item_doc_grid_border.xml index db66094fc..29a6cc53f 100644 --- a/res/drawable/item_doc_grid_border.xml +++ b/res/drawable/item_doc_grid_border.xml @@ -18,5 +18,5 @@ android:shape="rectangle"> + android:color="@color/color_default_divider"/> diff --git a/res/drawable/item_doc_grid_border_rounded.xml b/res/drawable/item_doc_grid_border_rounded.xml index e6ffbcad6..646edae33 100644 --- a/res/drawable/item_doc_grid_border_rounded.xml +++ b/res/drawable/item_doc_grid_border_rounded.xml @@ -18,6 +18,6 @@ android:shape="rectangle"> + android:color="@color/color_default_divider"/> diff --git a/res/drawable/list_divider.xml b/res/drawable/list_divider.xml index 5768aff8a..4e28c423f 100644 --- a/res/drawable/list_divider.xml +++ b/res/drawable/list_divider.xml @@ -16,7 +16,7 @@ - + diff --git a/res/drawable/list_item_background.xml b/res/drawable/list_item_background.xml index afbeecd27..9a5e72553 100644 --- a/res/drawable/list_item_background.xml +++ b/res/drawable/list_item_background.xml @@ -16,16 +16,16 @@ - + - + - + - + \ No newline at end of file diff --git a/res/drawable/menu_dropdown_panel.xml b/res/drawable/menu_dropdown_panel.xml index f750f0d5a..bd7dd4389 100644 --- a/res/drawable/menu_dropdown_panel.xml +++ b/res/drawable/menu_dropdown_panel.xml @@ -21,8 +21,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" android:tint="?android:attr/colorBackgroundFloating"> - - + + - + + android:color="@color/color_default_selector"/> \ No newline at end of file diff --git a/res/drawable/search_bar_background.xml b/res/drawable/search_bar_background.xml index ab657c385..68dae3c70 100644 --- a/res/drawable/search_bar_background.xml +++ b/res/drawable/search_bar_background.xml @@ -23,7 +23,7 @@ android:start="@dimen/search_bar_background_margin_start" android:end="@dimen/search_bar_background_margin_end"> - + diff --git a/res/drawable/selection_demo_band_overlay.xml b/res/drawable/selection_demo_band_overlay.xml index adf2b27f8..f16b97b65 100644 --- a/res/drawable/selection_demo_band_overlay.xml +++ b/res/drawable/selection_demo_band_overlay.xml @@ -17,6 +17,6 @@ - - + + diff --git a/res/drawable/sort_widget_background.xml b/res/drawable/sort_widget_background.xml index b7f6ae523..c8e0d51d7 100644 --- a/res/drawable/sort_widget_background.xml +++ b/res/drawable/sort_widget_background.xml @@ -24,7 +24,7 @@ + android:color="@color/color_default_divider" /> diff --git a/res/layout-sw720dp/directory_app_bar.xml b/res/layout-sw720dp/directory_app_bar.xml index 4bb63613a..711fab1ba 100644 --- a/res/layout-sw720dp/directory_app_bar.xml +++ b/res/layout-sw720dp/directory_app_bar.xml @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" android:layout_margin="@dimen/search_bar_margin" - android:background="?android:attr/colorBackground" + android:background="@color/color_default_primary_dark" android:theme="?actionBarTheme" android:popupTheme="?actionBarPopupTheme" android:elevation="3dp" diff --git a/res/layout/dialog_file_name.xml b/res/layout/dialog_file_name.xml index b62480a67..3201f8d60 100644 --- a/res/layout/dialog_file_name.xml +++ b/res/layout/dialog_file_name.xml @@ -15,6 +15,7 @@ --> @@ -29,14 +30,14 @@ android:layout_marginTop="@dimen/dialog_content_padding_top" android:layout_marginBottom="@dimen/dialog_content_padding_bottom" android:layout_centerInParent="true" - android:textColorHint="@color/hairline" + app:hintTextAppearance="@style/HintTextStyle" > diff --git a/res/layout/dialog_sorting.xml b/res/layout/dialog_sorting.xml index d8cb7364c..4102276a8 100644 --- a/res/layout/dialog_sorting.xml +++ b/res/layout/dialog_sorting.xml @@ -17,6 +17,7 @@ @@ -36,7 +37,7 @@ android:id="@+id/toolbar_background_layout" android:layout_width="match_parent" android:layout_height="@dimen/action_bar_space_height" - android:background="?android:attr/colorBackground" + android:background="@color/color_default_primary_dark" app:layout_collapseMode="pin"/> + app:titleTextColor="@color/color_default_primary_text"/> diff --git a/res/layout/inspector_activity.xml b/res/layout/inspector_activity.xml index df28d4968..5ab570f36 100644 --- a/res/layout/inspector_activity.xml +++ b/res/layout/inspector_activity.xml @@ -25,7 +25,7 @@ android:id="@+id/app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:colorBackground"> + android:background="@color/color_default_primary_dark" > @@ -55,7 +57,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" - android:background="?android:attr/colorBackground" + android:background="@color/color_default_primary_dark" android:theme="?actionBarTheme" app:title="@string/inspector_title" app:titleTextAppearance="@style/ToolbarTitle" diff --git a/res/layout/item_doc_grid.xml b/res/layout/item_doc_grid.xml index d8f6eaf83..cf97b9ca2 100644 --- a/res/layout/item_doc_grid.xml +++ b/res/layout/item_doc_grid.xml @@ -58,9 +58,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="centerCrop" - android:contentDescription="@null" - android:tint="?attr/gridItemTint" - android:tintMode="src_over"/> + android:contentDescription="@null" />