diff options
Diffstat (limited to 'packages/DocumentsUI')
37 files changed, 110 insertions, 59 deletions
diff --git a/packages/DocumentsUI/res/color/item_doc_grid_overlay.xml b/packages/DocumentsUI/res/color/item_doc_grid_overlay.xml new file mode 100644 index 0000000..6959c65 --- /dev/null +++ b/packages/DocumentsUI/res/color/item_doc_grid_overlay.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_activated="true" + android:color="?android:attr/colorControlHighlight" /> + <item + android:state_enabled="false" + android:color="?android:attr/colorBackground" + android:alpha="0.5" /> + <item + android:color="@android:color/transparent" /> +</selector>
\ No newline at end of file diff --git a/packages/DocumentsUI/res/color/item_doc_list_background_activated.xml b/packages/DocumentsUI/res/color/item_doc_list_background_activated.xml new file mode 100644 index 0000000..7d7a110 --- /dev/null +++ b/packages/DocumentsUI/res/color/item_doc_list_background_activated.xml @@ -0,0 +1,24 @@ +<?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_activated="true" + android:color="?android:attr/colorAccent" + android:alpha="0.1" /> + <item + android:color="@android:color/transparent" /> +</selector> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_album.xml b/packages/DocumentsUI/res/drawable/ic_doc_album.xml index 6b80a33..e7965e6 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_album.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_album.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_album_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_apk.xml b/packages/DocumentsUI/res/drawable/ic_doc_apk.xml index d1ba313..4f8f06e 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_apk.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_apk.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_apk_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_audio.xml b/packages/DocumentsUI/res/drawable/ic_doc_audio.xml index 24bd9fa..cf18b4f 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_audio.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_audio.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_audio_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_certificate.xml b/packages/DocumentsUI/res/drawable/ic_doc_certificate.xml index 3e5b9e6..c28ed4f 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_certificate.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_certificate.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_certificate_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_codes.xml b/packages/DocumentsUI/res/drawable/ic_doc_codes.xml index 441c669..0de721a 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_codes.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_codes.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_codes_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_compressed.xml b/packages/DocumentsUI/res/drawable/ic_doc_compressed.xml index 15ecb6b..a49cfa4 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_compressed.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_compressed.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_compressed_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_contact.xml b/packages/DocumentsUI/res/drawable/ic_doc_contact.xml index 361666a..bf550cb 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_contact.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_contact.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_contact_am_alpha" - android:tint="@*android:color/secondary_text_material_light" + android:tint="?android:attr/colorControlNormal" android:autoMirrored="true" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_event.xml b/packages/DocumentsUI/res/drawable/ic_doc_event.xml index a17018b..25cf0f3 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_event.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_event.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_event_am_alpha" - android:tint="@*android:color/secondary_text_material_light" + android:tint="?android:attr/colorControlNormal" android:autoMirrored="true" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_excel.xml b/packages/DocumentsUI/res/drawable/ic_doc_excel.xml index 7d05361..3354725 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_excel.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_excel.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_excel_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_folder.xml b/packages/DocumentsUI/res/drawable/ic_doc_folder.xml index 85f5e7c..73de60e 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_folder.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_folder.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_folder_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_font.xml b/packages/DocumentsUI/res/drawable/ic_doc_font.xml index e79ed0c..c74cb9c 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_font.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_font.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_font_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_generic.xml b/packages/DocumentsUI/res/drawable/ic_doc_generic.xml index d0d999f..a4ee29d 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_generic.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_generic.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_generic_am_alpha" - android:tint="@*android:color/secondary_text_material_light" + android:tint="?android:attr/colorControlNormal" android:autoMirrored="true" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_image.xml b/packages/DocumentsUI/res/drawable/ic_doc_image.xml index fa949e0..9d4c359 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_image.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_image.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_image_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_pdf.xml b/packages/DocumentsUI/res/drawable/ic_doc_pdf.xml index 51620f5..5c37498 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_pdf.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_pdf.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_pdf_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_powerpoint.xml b/packages/DocumentsUI/res/drawable/ic_doc_powerpoint.xml index 2a048c8..f0a6c39 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_powerpoint.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_powerpoint.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_powerpoint_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_presentation.xml b/packages/DocumentsUI/res/drawable/ic_doc_presentation.xml index 71bb853..a14f866 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_presentation.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_presentation.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_presentation_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_spreadsheet.xml b/packages/DocumentsUI/res/drawable/ic_doc_spreadsheet.xml index 4b4cd99..40f2515 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_spreadsheet.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_spreadsheet.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_spreadsheet_am_alpha" - android:tint="@*android:color/secondary_text_material_light" + android:tint="?android:attr/colorControlNormal" android:autoMirrored="true" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_text.xml b/packages/DocumentsUI/res/drawable/ic_doc_text.xml index 8224a21..ffa9e70 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_text.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_text.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_text_am_alpha" - android:tint="@*android:color/secondary_text_material_light" + android:tint="?android:attr/colorControlNormal" android:autoMirrored="true" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_video.xml b/packages/DocumentsUI/res/drawable/ic_doc_video.xml index 1fed041..2d048c2 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_video.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_video.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_video_am_alpha" - android:tint="@*android:color/secondary_text_material_light" + android:tint="?android:attr/colorControlNormal" android:autoMirrored="true" /> diff --git a/packages/DocumentsUI/res/drawable/ic_doc_word.xml b/packages/DocumentsUI/res/drawable/ic_doc_word.xml index addfb47..afcc533 100644 --- a/packages/DocumentsUI/res/drawable/ic_doc_word.xml +++ b/packages/DocumentsUI/res/drawable/ic_doc_word.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_doc_word_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_grid_folder.xml b/packages/DocumentsUI/res/drawable/ic_grid_folder.xml index 344d558..0c87869 100644 --- a/packages/DocumentsUI/res/drawable/ic_grid_folder.xml +++ b/packages/DocumentsUI/res/drawable/ic_grid_folder.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_grid_folder_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_root_download.xml b/packages/DocumentsUI/res/drawable/ic_root_download.xml index a7642f9..f07d8f0 100644 --- a/packages/DocumentsUI/res/drawable/ic_root_download.xml +++ b/packages/DocumentsUI/res/drawable/ic_root_download.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_root_download_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_root_folder.xml b/packages/DocumentsUI/res/drawable/ic_root_folder.xml index cda9db8..01df07b 100644 --- a/packages/DocumentsUI/res/drawable/ic_root_folder.xml +++ b/packages/DocumentsUI/res/drawable/ic_root_folder.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_root_folder_am_alpha" - android:tint="@*android:color/secondary_text_material_light" + android:tint="?android:attr/colorControlNormal" android:autoMirrored="true" /> diff --git a/packages/DocumentsUI/res/drawable/ic_root_recent.xml b/packages/DocumentsUI/res/drawable/ic_root_recent.xml index d6b33c9..41e6a5e 100644 --- a/packages/DocumentsUI/res/drawable/ic_root_recent.xml +++ b/packages/DocumentsUI/res/drawable/ic_root_recent.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_root_recent_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_root_sdcard.xml b/packages/DocumentsUI/res/drawable/ic_root_sdcard.xml index 0b9523b..27cfa81 100644 --- a/packages/DocumentsUI/res/drawable/ic_root_sdcard.xml +++ b/packages/DocumentsUI/res/drawable/ic_root_sdcard.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_root_sdcard_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/ic_root_usb_light.xml b/packages/DocumentsUI/res/drawable/ic_root_usb_light.xml index ff2b197..5f80dd9 100644 --- a/packages/DocumentsUI/res/drawable/ic_root_usb_light.xml +++ b/packages/DocumentsUI/res/drawable/ic_root_usb_light.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_root_usb_light_alpha" - android:tint="@*android:color/secondary_text_material_light" /> + android:tint="?android:attr/colorControlNormal" /> diff --git a/packages/DocumentsUI/res/drawable/item_doc_grid_overlay.xml b/packages/DocumentsUI/res/drawable/item_doc_grid_overlay.xml index 3fbd25e..3f50fb9 100644 --- a/packages/DocumentsUI/res/drawable/item_doc_grid_overlay.xml +++ b/packages/DocumentsUI/res/drawable/item_doc_grid_overlay.xml @@ -14,9 +14,7 @@ limitations under the License. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:state_activated="true" android:drawable="@color/item_doc_grid_overlay_activated" /> - <item android:state_focused="false" android:state_activated="true" android:drawable="@color/item_doc_grid_overlay_activated" /> - <item android:state_enabled="false" android:drawable="@color/item_doc_grid_overlay_disabled" /> - <item android:drawable="@android:color/transparent" /> -</selector> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="@color/item_doc_grid_overlay" /> +</shape> diff --git a/packages/DocumentsUI/res/drawable/item_doc_list_background.xml b/packages/DocumentsUI/res/drawable/item_doc_list_background.xml index b879542..13910bb 100644 --- a/packages/DocumentsUI/res/drawable/item_doc_list_background.xml +++ b/packages/DocumentsUI/res/drawable/item_doc_list_background.xml @@ -14,8 +14,7 @@ limitations under the License. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:state_activated="true" android:drawable="@color/item_doc_list_background_activated" /> - <item android:state_focused="false" android:state_activated="true" android:drawable="@color/item_doc_list_background_activated" /> - <item android:drawable="@android:color/transparent" /> -</selector> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="@color/item_doc_list_background_activated" /> +</shape> diff --git a/packages/DocumentsUI/res/layout-sw720dp/activity.xml b/packages/DocumentsUI/res/layout-sw720dp/activity.xml index 1cffd17..7b40a0f 100644 --- a/packages/DocumentsUI/res/layout-sw720dp/activity.xml +++ b/packages/DocumentsUI/res/layout-sw720dp/activity.xml @@ -53,8 +53,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:orientation="vertical" - android:elevation="8dp" - android:background="@color/material_grey_50"> + android:elevation="8dp"> <com.android.documentsui.DirectoryContainerView android:id="@+id/container_directory" @@ -66,7 +65,6 @@ android:id="@+id/container_save" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/material_grey_50" android:elevation="8dp" /> </LinearLayout> diff --git a/packages/DocumentsUI/res/layout/activity.xml b/packages/DocumentsUI/res/layout/activity.xml index 120168e..b549cd3 100644 --- a/packages/DocumentsUI/res/layout/activity.xml +++ b/packages/DocumentsUI/res/layout/activity.xml @@ -51,7 +51,6 @@ android:id="@+id/container_save" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/material_grey_50" android:elevation="8dp" /> </LinearLayout> diff --git a/packages/DocumentsUI/res/layout/fragment_directory.xml b/packages/DocumentsUI/res/layout/fragment_directory.xml index 4717839..2c08e72 100644 --- a/packages/DocumentsUI/res/layout/fragment_directory.xml +++ b/packages/DocumentsUI/res/layout/fragment_directory.xml @@ -16,8 +16,7 @@ <com.android.documentsui.DirectoryView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/material_grey_50"> + android:layout_height="match_parent"> <TextView android:id="@android:id/empty" diff --git a/packages/DocumentsUI/res/values-night/colors.xml b/packages/DocumentsUI/res/values-night/colors.xml new file mode 100644 index 0000000..87cac78 --- /dev/null +++ b/packages/DocumentsUI/res/values-night/colors.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> + <color name="item_doc_grid_background">#ff111111</color> + <color name="item_doc_grid_protect_background">#88ffffff</color> +</resources> diff --git a/packages/DocumentsUI/res/values-sw720dp/styles.xml b/packages/DocumentsUI/res/values-sw720dp/styles.xml index 9968bb8..45ed7ad 100644 --- a/packages/DocumentsUI/res/values-sw720dp/styles.xml +++ b/packages/DocumentsUI/res/values-sw720dp/styles.xml @@ -16,6 +16,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DialogWhenReallyLarge" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.FixedSize" /> + <style name="DialogWhenReallyLarge" parent="@*android:style/Theme.Material.DayNight.Dialog.FixedSize" /> </resources> diff --git a/packages/DocumentsUI/res/values/colors.xml b/packages/DocumentsUI/res/values/colors.xml index 2ceb968..2b839d4 100644 --- a/packages/DocumentsUI/res/values/colors.xml +++ b/packages/DocumentsUI/res/values/colors.xml @@ -15,19 +15,8 @@ --> <resources> - <color name="material_grey_50">#fffafafa</color> <color name="material_grey_300">#ffeeeeee</color> <color name="item_doc_grid_background">@color/material_grey_300</color> - <color name="item_doc_grid_protect_background">#88000000</color> - - <color name="item_doc_grid_overlay_activated">#88000000</color> - <color name="item_doc_grid_overlay_disabled">#88ffffff</color> - - <color name="item_doc_list_overlay_disabled">#88ffffff</color> - - <!-- 10% alpha of material_deep_teal_500 --> - <color name="item_doc_list_background_activated">#1a009688</color> - </resources> diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml index 39c958e..45dc20b 100644 --- a/packages/DocumentsUI/res/values/styles.xml +++ b/packages/DocumentsUI/res/values/styles.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DialogWhenReallyLarge" parent="@android:style/Theme.DeviceDefault.Light" /> + <style name="DialogWhenReallyLarge" parent="@android:style/Theme.Material.DayNight.DarkActionBar" /> <style name="DocumentsTheme" parent="@style/DialogWhenReallyLarge"> <item name="android:actionBarWidgetTheme">@null</item> @@ -43,10 +43,8 @@ <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item> </style> - <style name="StandaloneTheme" parent="android:Theme.DeviceDefault.Light"> + <style name="StandaloneTheme" parent="@android:style/Theme.Material.DayNight.DarkActionBar"> <item name="android:actionBarWidgetTheme">@null</item> - <item name="android:actionBarTheme">@*android:style/ThemeOverlay.Material.Dark.ActionBar</item> - <item name="android:actionBarPopupTheme">@*android:style/ThemeOverlay.Material.Light</item> <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_900</item> <item name="android:colorPrimary">@*android:color/material_blue_grey_800</item> |