diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-04-25 08:47:11 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-04-25 08:54:51 -0700 |
| commit | 020aae74d3aa9d63a2f0fd7298552487b66d9ef5 (patch) | |
| tree | 2a94c9ebb108258ec055de40bab7af2fc8086eaf /res/values/filtershow_color.xml | |
| parent | 0819a57868f0b68c9766a0115253912fb6d3c9e7 (diff) | |
| parent | 7873e5b0f4e97aaadbcbb9064f31fdba48405945 (diff) | |
| download | android_packages_apps_Snap-020aae74d3aa9d63a2f0fd7298552487b66d9ef5.tar.gz android_packages_apps_Snap-020aae74d3aa9d63a2f0fd7298552487b66d9ef5.tar.bz2 android_packages_apps_Snap-020aae74d3aa9d63a2f0fd7298552487b66d9ef5.zip | |
resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad
Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
Diffstat (limited to 'res/values/filtershow_color.xml')
| -rw-r--r-- | res/values/filtershow_color.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml index 70191fdc3..f6bf7fbc8 100644 --- a/res/values/filtershow_color.xml +++ b/res/values/filtershow_color.xml @@ -26,7 +26,15 @@ <color name="toolbar_separation_line">#333333</color> <color name="slider_dot_color">#6464FF</color> <color name="slider_line_color">#33B5E5</color> + <color name="state_panel_separation_line">#232323</color> <color name="filtershow_background">#333333</color> <color name="filtershow_graphic">#717171</color> - + <color name="filtershow_stateview_end_background">#232323</color> + <color name="filtershow_stateview_end_text">#a7a7a7</color> + <color name="filtershow_stateview_background">#464646</color> + <color name="filtershow_stateview_text">#FFFFFF</color> + <color name="filtershow_stateview_selected_background">#c8c8c8</color> + <color name="filtershow_stateview_selected_text">#000000</color> + <color name="filtershow_categoryview_background">#1a1a1a</color> + <color name="filtershow_categoryview_text">#a7a7a7</color> </resources>
\ No newline at end of file |