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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1698043006: Created the dialog offering the user to merge their account data or keep it (Closed) Base URL: maybelle.lon.corp.google.com:/usr/local/google/code/clankium/src@sync_settings
Patch Set: Created 4 years, 10 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
« no previous file with comments | « chrome/android/java/res/values/attrs.xml ('k') | chrome/android/java/res/values/dimens.xml » ('j') | chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 <color name="data_reduction_chart_background_color">#FAFAFA</color> 72 <color name="data_reduction_chart_background_color">#FAFAFA</color>
73 73
74 <!-- Compositor Tab Title Colors --> 74 <!-- Compositor Tab Title Colors -->
75 <color name="compositor_tab_title_bar_text">#555555</color> 75 <color name="compositor_tab_title_bar_text">#555555</color>
76 <color name="compositor_tab_title_bar_text_incognito">#FFFFFFFF</color> 76 <color name="compositor_tab_title_bar_text_incognito">#FFFFFFFF</color>
77 <color name="compositor_tab_title_bar_shadow">#AAFFFFFF</color> 77 <color name="compositor_tab_title_bar_shadow">#AAFFFFFF</color>
78 <color name="compositor_tab_title_bar_shadow_incognito">#88000000</color> 78 <color name="compositor_tab_title_bar_shadow_incognito">#88000000</color>
79 79
80 <!-- First Run Experience Colors --> 80 <!-- First Run Experience Colors -->
81 <color name="fre_text_color">#000000</color> 81 <color name="fre_text_color">#000000</color>
82 <color name="fre_light_text_color">#494949</color>
83 <color name="fre_title_color">#161616</color> 82 <color name="fre_title_color">#161616</color>
83
84 <!-- Account Signin Colors -->
85 <!-- As in dimens.xml, signin uses values from the First Run Experience -->
86 <color name="signin_light_text_color">#494949</color>
84 87
85 <!-- Sad Tab colors --> 88 <!-- Sad Tab colors -->
86 <color name="sad_tab_header_text_color">#333333</color> 89 <color name="sad_tab_header_text_color">#333333</color>
87 <color name="sad_tab_body_text_color">#646464</color> 90 <color name="sad_tab_body_text_color">#646464</color>
88 91
89 <!-- NTP Colors. Used on the bookmarks and recent tabs pages. --> 92 <!-- NTP Colors. Used on the bookmarks and recent tabs pages. -->
90 <color name="ntp_bg">#fff</color> 93 <color name="ntp_bg">#fff</color>
91 <color name="ntp_bg_incognito">#222</color> 94 <color name="ntp_bg_incognito">#222</color>
92 <color name="ntp_list_item_text">#333</color> 95 <color name="ntp_list_item_text">#333</color>
93 <color name="ntp_list_header_text">#333</color> 96 <color name="ntp_list_header_text">#333</color>
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 173
171 <!-- Physical Web diagnostics colors --> 174 <!-- Physical Web diagnostics colors -->
172 <color name="physical_web_diags_success_color">#00933b</color> 175 <color name="physical_web_diags_success_color">#00933b</color>
173 <color name="physical_web_diags_failure_color">#f90101</color> 176 <color name="physical_web_diags_failure_color">#f90101</color>
174 <color name="physical_web_diags_indeterminate_color">#f2b50f</color> 177 <color name="physical_web_diags_indeterminate_color">#f2b50f</color>
175 178
176 <!-- Bottom bar colors --> 179 <!-- Bottom bar colors -->
177 <color name="bottom_bar_shadow_color">#1d000000</color> 180 <color name="bottom_bar_shadow_color">#1d000000</color>
178 181
179 </resources> 182 </resources>
OLDNEW
« no previous file with comments | « chrome/android/java/res/values/attrs.xml ('k') | chrome/android/java/res/values/dimens.xml » ('j') | chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698