Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of bc2ba56 to master

Browse Source 
Change-Id: Ie7c1ba0704e392efc6122a8addb6c082680a7c2e
This commit is contained in:
Andrew Sapperstein
2016-07-03 15:36:00 -04:00
parent 954f60b57a bc2ba56507
commit 6b77f8126f
6 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/colors_device_defaults.xml
View File

@@ -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>
<color name="accent_device_default_50">@color/material_deep_teal_50</color>
</resources>

2
core/res/res/values/colors_material.xml
View File

@@ -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>

2
packages/DocumentsUI/res/drawable/ic_check_circle.xml
View File

@@ -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>

4
packages/DocumentsUI/res/values/attrs.xml
View File

@@ -14,10 +14,6 @@
limitations under the License.
-->
<resources>
<declare-styleable name="DocumentsTheme">
<attr name="colorActionMode" format="color"/>
</declare-styleable>
<declare-styleable name="HighlightedItemView">
<attr name="state_highlighted" format="boolean"/>
</declare-styleable>

20
packages/DocumentsUI/res/values/colors.xml
View File

@@ -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,23 +23,20 @@
<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>
<color name="item_breadcrumb_background_hovered">#1affffff</color>
</resources>

3
packages/DocumentsUI/res/values/styles.xml
View File

@@ -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>