diff options
| -rw-r--r-- | core/res/res/values/colors_device_defaults.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/colors_material.xml | 2 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/drawable/ic_check_circle.xml | 2 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values/attrs.xml | 20 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values/colors.xml | 20 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values/styles.xml | 3 |
6 files changed, 14 insertions, 37 deletions
diff --git a/core/res/res/values/colors_device_defaults.xml b/core/res/res/values/colors_device_defaults.xml index f33eb6fd2816..27ee27bdd165 100644 --- a/core/res/res/values/colors_device_defaults.xml +++ b/core/res/res/values/colors_device_defaults.xml @@ -28,6 +28,8 @@ <color name="tertiary_device_default_settings">@color/tertiary_material_settings</color> <color name="quaternary_device_default_settings">@color/quaternary_material_settings</color> + <color name="accent_device_default_700">@color/material_deep_teal_700</color> <color name="accent_device_default_light">@color/accent_material_light</color> <color name="accent_device_default_dark">@color/accent_material_dark</color> -</resources>
\ No newline at end of file + <color name="accent_device_default_50">@color/material_deep_teal_50</color> +</resources> diff --git a/core/res/res/values/colors_material.xml b/core/res/res/values/colors_material.xml index 8a6c229bcdd0..a864cf384adb 100644 --- a/core/res/res/values/colors_material.xml +++ b/core/res/res/values/colors_material.xml @@ -81,10 +81,12 @@ <color name="material_grey_100">#fff5f5f5</color> <color name="material_grey_50">#fffafafa</color> + <color name="material_deep_teal_50">#ffe0f2f1</color> <color name="material_deep_teal_100">#ffb2dfdb</color> <color name="material_deep_teal_200">#ff80cbc4</color> <color name="material_deep_teal_300">#ff4db6ac</color> <color name="material_deep_teal_500">#ff009688</color> + <color name="material_deep_teal_700">#ff00796b</color> <color name="material_blue_grey_200">#ffb0bec5</color> <color name="material_blue_grey_700">#ff455a64</color> diff --git a/packages/DocumentsUI/res/drawable/ic_check_circle.xml b/packages/DocumentsUI/res/drawable/ic_check_circle.xml index d49ba6ab0526..62a4e34b4969 100644 --- a/packages/DocumentsUI/res/drawable/ic_check_circle.xml +++ b/packages/DocumentsUI/res/drawable/ic_check_circle.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF009688" + android:fillColor="?android:attr/colorAccent" android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10,-10S17.52 2 12 2zm-2 15l-5,-5 1.41,-1.41L10 14.17l7.59,-7.59L19 8l-9 9z"/> </vector> diff --git a/packages/DocumentsUI/res/values/attrs.xml b/packages/DocumentsUI/res/values/attrs.xml deleted file mode 100644 index 9e130011496b..000000000000 --- a/packages/DocumentsUI/res/values/attrs.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> - <declare-styleable name="DocumentsTheme"> - <attr name="colorActionMode" format="color"/> - </declare-styleable> -</resources> diff --git a/packages/DocumentsUI/res/values/colors.xml b/packages/DocumentsUI/res/values/colors.xml index cf0643d8ceaa..366a8a42dd18 100644 --- a/packages/DocumentsUI/res/values/colors.xml +++ b/packages/DocumentsUI/res/values/colors.xml @@ -15,9 +15,6 @@ --> <resources> - <color name="material_grey_400">#ffbdbdbd</color> - <color name="material_teal_700">#ff00796b</color> - <!-- 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). --> @@ -26,22 +23,19 @@ <color name="directory_background">#fff7f7f7</color> <color name="menu_search_background">@android:color/transparent</color> - <color name="primary_dark">@*android:color/primary_dark_material_dark</color> - <color name="primary">@*android:color/material_blue_grey_900</color> - <color name="accent">@*android:color/accent_material_light</color> - <color name="accent_dark">@*android:color/accent_material_dark</color> - <color name="action_mode">@color/material_grey_400</color> - <color name="status_bar_color">@*android:color/material_blue_grey_950</color> + <color name="primary_dark">@*android:color/primary_dark_device_default_settings</color> + <color name="primary">@*android:color/primary_device_default_settings</color> + <color name="accent">@*android:color/accent_device_default_light</color> + <color name="accent_dark">@*android:color/accent_device_default_dark</color> <color name="band_select_background">#88ffffff</color> <color name="band_select_border">#44000000</color> - <color name="item_doc_background_disabled">#fff4f4f4</color> - - <color name="root_activated_color">@color/material_teal_700</color> + <color name="root_activated_color">@*android:color/accent_device_default_700</color> <!-- TODO: Would be nice to move this to a color-set, but not sure how to support animation --> <color name="item_doc_background">#fffafafa</color> - <color name="item_doc_background_selected">#ffe0f2f1</color> + <color name="item_doc_background_disabled">#fff4f4f4</color> + <color name="item_doc_background_selected">@*android:color/accent_device_default_50</color> </resources> diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml index 9f09ebc480e5..b5e32d405ac7 100644 --- a/packages/DocumentsUI/res/values/styles.xml +++ b/packages/DocumentsUI/res/values/styles.xml @@ -28,9 +28,8 @@ <item name="android:colorPrimaryDark">@color/primary_dark</item> <item name="android:colorPrimary">@color/primary</item> <item name="android:colorAccent">@color/accent</item> - <item name="colorActionMode">@color/action_mode</item> + <item name="android:colorControlActivated">?android:attr/colorAccent</item> <item name="android:queryBackground">@color/menu_search_background</item> - <item name="android:statusBarColor">@color/status_bar_color</item> <item name="android:listDivider">@*android:drawable/list_divider_material</item> |