summaryrefslogtreecommitdiffstats
path: root/res/values/colors.xml
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2015-07-21 17:01:26 -0700
committerEd Heyl <edheyl@google.com>2015-07-22 11:31:04 -0700
commite612775922ec9f8cc4e5cb976bc62b3312a3de0e (patch)
tree96beaf07307486f6491f022da63ebe381765d1a8 /res/values/colors.xml
parenta83129f0bc778fd1ccd799bd8cfa40270f632e1d (diff)
downloadandroid_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.gz
android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.bz2
android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.zip
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
Diffstat (limited to 'res/values/colors.xml')
-rw-r--r--res/values/colors.xml28
1 files changed, 21 insertions, 7 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2daf9fe12..51e4d40a5 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,20 +20,34 @@
<resources>
<!-- The color tints to apply to the text and drag view when hovering
over the delete target or the info target -->
- <color name="delete_target_hover_tint">#DAFF0000</color>
- <color name="info_target_hover_tint">#DA0099CC</color>
+ <color name="delete_target_hover_tint">#FFC1C1C1</color>
+ <color name="uninstall_target_hover_tint">#FFF0592B</color>
+ <color name="info_target_hover_tint">#FF009688</color>
<color name="cling_scrim_background">#80000000</color>
- <color name="bubble_dark_background">#20000000</color>
<color name="focused_background">#80c6c5c5</color>
- <color name="appwidget_error_color">#FCCC</color>
-
<color name="workspace_icon_text_color">#FFF</color>
+ <color name="workspace_edge_effect_color">#FFFFFFFF</color>
+ <color name="folder_edge_effect_color">#FF757575</color>
+
<color name="quantum_panel_text_color">#FF666666</color>
- <color name="quantum_panel_text_shadow_color">#FFC4C4C4</color>
+ <color name="quantum_panel_bg_color">#FFF5F5F5</color>
+ <color name="quantum_panel_bg_color_dark">#FF374248</color>
+
<color name="outline_color">#FFFFFFFF</color>
- <color name="widget_text_panel">#FF374248</color>
+ <!-- Containers -->
+ <color name="container_fastscroll_thumb_inactive_color">#42000000</color>
+ <color name="container_fastscroll_thumb_active_color">#009688</color>
+
+ <!-- All Apps -->
+ <color name="all_apps_grid_section_text_color">#009688</color>
+
+ <!-- Widgets view -->
+ <color name="widgets_view_fastscroll_thumb_inactive_color">#42FFFFFF</color>
+ <color name="widgets_view_section_text_color">#FFFFFF</color>
+ <color name="widgets_view_item_text_color">#C4C4C4</color>
+ <color name="widgets_cell_color">#263238</color>
</resources>