Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Side by Side Diff: chrome/android/java/res/values/colors.xml

Issue 2758313002: Implement the new Photo picker, part two. (Closed)
Patch Set: Fix scrim color Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2014 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2014 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <resources> 6 <resources>
7 <!-- Common colors --> 7 <!-- Common colors -->
8 <color name="default_text_color">#333</color> 8 <color name="default_text_color">#333</color>
9 <color name="default_primary_color">#f2f2f2</color> 9 <color name="default_primary_color">#f2f2f2</color>
10 <color name="light_normal_color">#5A5A5A</color> 10 <color name="light_normal_color">#5A5A5A</color>
(...skipping 11 matching lines...) Expand all
22 <color name="google_green_700">#0b8043</color> 22 <color name="google_green_700">#0b8043</color>
23 <color name="google_grey_100">#f5f5f5</color> 23 <color name="google_grey_100">#f5f5f5</color>
24 <color name="google_grey_300">#e0e0e0</color> 24 <color name="google_grey_300">#e0e0e0</color>
25 <color name="google_grey_400">#bdbdbd</color> 25 <color name="google_grey_400">#bdbdbd</color>
26 <color name="google_grey_500">#9E9E9E</color> 26 <color name="google_grey_500">#9E9E9E</color>
27 <color name="google_grey_600">#757575</color> 27 <color name="google_grey_600">#757575</color>
28 <color name="google_grey_700">#616161</color> 28 <color name="google_grey_700">#616161</color>
29 <color name="toolbar_shadow_color">#1d000000</color> 29 <color name="toolbar_shadow_color">#1d000000</color>
30 <color name="semi_opaque_white">#80ffffff</color> 30 <color name="semi_opaque_white">#80ffffff</color>
31 <color name="toolbar_light_tint">#A3000000</color> 31 <color name="toolbar_light_tint">#A3000000</color>
32 <color name="black_alpha_00">#00000000</color>
Theresa 2017/03/28 20:40:27 Isn't this just transparent (@android:color/transp
Finnur 2017/03/31 14:26:49 Indeed! Removed.
33 <color name="white_alpha_30">#4d000000</color>
Theresa 2017/03/28 20:40:27 #000000 is black, not white. progress_bar_backgrou
Finnur 2017/03/31 14:26:49 Ah, right.
32 <color name="light_grey">#ccc</color> 34 <color name="light_grey">#ccc</color>
33 35
34 <!-- Infobar colors --> 36 <!-- Infobar colors -->
35 <color name="infobar_accent_blue">#4285f4</color> 37 <color name="infobar_accent_blue">#4285f4</color>
36 <color name="infobar_descriptive_text_color">#646464</color> 38 <color name="infobar_descriptive_text_color">#646464</color>
37 39
38 <!-- Snackbar colors --> 40 <!-- Snackbar colors -->
39 <color name="snackbar_background_color">#282C32</color> 41 <color name="snackbar_background_color">#282C32</color>
40 42
41 <!-- Tab Switcher Colors --> 43 <!-- Tab Switcher Colors -->
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 <!-- Contextual Search colors --> 123 <!-- Contextual Search colors -->
122 <color name="contextual_search_promo_text_color">#333333</color> 124 <color name="contextual_search_promo_text_color">#333333</color>
123 <color name="contextual_search_promo_background_color">#EEEEEE</color> 125 <color name="contextual_search_promo_background_color">#EEEEEE</color>
124 <color name="contextual_search_promo_border_color">#C2C2C2</color> 126 <color name="contextual_search_promo_border_color">#C2C2C2</color>
125 127
126 <!-- Progress Bar colors --> 128 <!-- Progress Bar colors -->
127 <color name="progress_bar_foreground">@color/light_active_color</color> 129 <color name="progress_bar_foreground">@color/light_active_color</color>
128 <color name="progress_bar_foreground_white">@android:color/white</color> 130 <color name="progress_bar_foreground_white">@android:color/white</color>
129 <color name="progress_bar_secondary">@color/google_grey_600</color> 131 <color name="progress_bar_secondary">@color/google_grey_600</color>
130 <color name="progress_bar_background">#3d4386f7</color> 132 <color name="progress_bar_background">#3d4386f7</color>
131 <color name="progress_bar_background_white">#4d000000</color> 133 <color name="progress_bar_background_white">@color/white_alpha_30</color>
132 134
133 <!-- Theme colors. Also used for toolbar background --> 135 <!-- Theme colors. Also used for toolbar background -->
134 <color name="incognito_primary_color">#505050</color> 136 <color name="incognito_primary_color">#505050</color>
135 137
136 <!-- LocationBar colors --> 138 <!-- LocationBar colors -->
137 <color name="locationbar_dark_hint_text">#969696</color> 139 <color name="locationbar_dark_hint_text">#969696</color>
138 <color name="locationbar_light_hint_text">#80ffffff</color> 140 <color name="locationbar_light_hint_text">#80ffffff</color>
139 <color name="locationbar_light_selection_color">#cc5595fe</color> 141 <color name="locationbar_light_selection_color">#cc5595fe</color>
140 <color name="locationbar_status_color">@color/light_normal_color</color> 142 <color name="locationbar_status_color">@color/light_normal_color</color>
141 <color name="locationbar_status_color_light">#ffffff</color> 143 <color name="locationbar_status_color_light">#ffffff</color>
(...skipping 28 matching lines...) Expand all
170 <color name="appbar_background">@color/default_primary_color</color> 172 <color name="appbar_background">@color/default_primary_color</color>
171 173
172 <!-- Bookmark UI colors --> 174 <!-- Bookmark UI colors -->
173 <color name="bookmark_detail_text">#212121</color> 175 <color name="bookmark_detail_text">#212121</color>
174 <color name="bookmark_detail_section">#7C7B79</color> 176 <color name="bookmark_detail_section">#7C7B79</color>
175 <color name="bookmark_drawer_selected_background_color">#F0F0F0</color> 177 <color name="bookmark_drawer_selected_background_color">#F0F0F0</color>
176 178
177 <!-- Favicon colors --> 179 <!-- Favicon colors -->
178 <color name="default_favicon_background_color">#ff787878</color> 180 <color name="default_favicon_background_color">#ff787878</color>
179 181
182 <!-- File Picker colors -->
183 <color name="file_picker_tile_bg_color">#eeeeee</color>
Theresa 2017/03/28 20:40:27 @color/google_grey_200 (defined in a different in-
Finnur 2017/03/31 14:26:49 Done.
184 <color name="file_picker_special_tile_bg_color">#263238</color>
Theresa 2017/03/28 20:40:27 @color/dar_action_bar_color
Finnur 2017/03/31 14:26:49 Done.
185 <color name="file_picker_special_tile_color">#fff</color>
Theresa 2017/03/28 20:40:27 @android:color/white
Finnur 2017/03/31 14:26:49 Done.
186 <color name="file_picker_special_tile_disabled_bg_color">#e0e0e0</color>
Theresa 2017/03/28 20:40:27 @color/google_grey_300
187 <color name="file_picker_special_tile_disabled_color">#bdbdbd</color>
Theresa 2017/03/28 20:40:27 @color/google_grey_400
Finnur 2017/03/31 14:26:49 Done. Thinking about this some more; it would be
188
180 <!-- Bookmark widget colors --> 189 <!-- Bookmark widget colors -->
181 <color name="bookmark_widget_pressed_highlight">#1D000000</color> 190 <color name="bookmark_widget_pressed_highlight">#1D000000</color>
182 191
183 <!-- Physical Web diagnostics colors --> 192 <!-- Physical Web diagnostics colors -->
184 <color name="physical_web_diags_success_color">#00933b</color> 193 <color name="physical_web_diags_success_color">#00933b</color>
185 <color name="physical_web_diags_failure_color">#f90101</color> 194 <color name="physical_web_diags_failure_color">#f90101</color>
186 <color name="physical_web_diags_indeterminate_color">#f2b50f</color> 195 <color name="physical_web_diags_indeterminate_color">#f2b50f</color>
187 196
188 <!-- Bottom bar colors --> 197 <!-- Bottom bar colors -->
189 <color name="bottom_bar_shadow_color">#1d000000</color> 198 <color name="bottom_bar_shadow_color">#1d000000</color>
190 199
191 <!-- Payments UI colors --> 200 <!-- Payments UI colors -->
192 <color name="payments_ui_scrim">#000000</color> 201 <color name="payments_ui_scrim">#000000</color>
193 <color name="payments_section_edit_background">#f5f5f5</color> 202 <color name="payments_section_edit_background">#f5f5f5</color>
194 <color name="payments_section_chevron">#b2b2b2</color> 203 <color name="payments_section_chevron">#b2b2b2</color>
195 <color name="payments_section_separator">#e0e0e0</color> 204 <color name="payments_section_separator">#e0e0e0</color>
196 205
197 <!-- Other colors --> 206 <!-- Other colors -->
198 <color name="selectable_list_item_highlight_color">#804281f4</color> 207 <color name="selectable_list_item_highlight_color">#804281f4</color>
199 <color name="media_viewer_bg">#000000</color> 208 <color name="media_viewer_bg">#000000</color>
200 <color name="image_viewer_bg">#0e0e0e</color> 209 <color name="image_viewer_bg">#0e0e0e</color>
201 210
202 </resources> 211 </resources>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698