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

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

Issue 1745563002: Revert of 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, 9 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 <!-- Connection info popup dimensions --> 7 <!-- Connection info popup dimensions -->
8 <dimen name="connection_info_padding_wide">24dp</dimen> 8 <dimen name="connection_info_padding_wide">24dp</dimen>
9 <dimen name="connection_info_padding_thin">16dp</dimen> 9 <dimen name="connection_info_padding_thin">16dp</dimen>
10 10
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 <!-- User Picture Dimensions --> 154 <!-- User Picture Dimensions -->
155 <dimen name="user_picture_size">40dp</dimen> 155 <dimen name="user_picture_size">40dp</dimen>
156 <dimen name="badged_user_picture_height">40dp</dimen> 156 <dimen name="badged_user_picture_height">40dp</dimen>
157 <!-- The design spec is that the center of the badge should be 4dp from the right edge of the 157 <!-- The design spec is that the center of the badge should be 4dp from the right edge of the
158 user picture. This is equivalent to a badged_user_picture_width of 46dp assu ming a badge_radius 158 user picture. This is equivalent to a badged_user_picture_width of 46dp assu ming a badge_radius
159 of 10dp. --> 159 of 10dp. -->
160 <dimen name="badged_user_picture_width">46dp</dimen> 160 <dimen name="badged_user_picture_width">46dp</dimen>
161 <dimen name="badge_radius">10dp</dimen> 161 <dimen name="badge_radius">10dp</dimen>
162 <dimen name="badge_border_size">1.3dp</dimen> 162 <dimen name="badge_border_size">1.3dp</dimen>
163 163
164 <!-- First Run Experience dimensions --> 164 <!-- First Run Experience and Welcome Page dimensions -->
165 <dimen name="fre_button_padding">12dp</dimen> 165 <dimen name="fre_button_padding">12dp</dimen>
166 <dimen name="fre_margin">24dp</dimen> 166 <dimen name="fre_margin">24dp</dimen>
167 <dimen name="fre_title_text_size">24sp</dimen> 167 <dimen name="fre_title_text_size">24sp</dimen>
168 <dimen name="fre_button_text_size">14sp</dimen> 168 <dimen name="fre_button_text_size">14sp</dimen>
169 <dimen name="fre_normal_text_size">14sp</dimen> 169 <dimen name="fre_normal_text_size">14sp</dimen>
170 <dimen name="fre_image_height">130dp</dimen> 170 <dimen name="fre_image_carousel_width">260dp</dimen>
171 <dimen name="fre_image_carousel_height">130dp</dimen>
172 <dimen name="fre_checkmark_size">38dp</dimen>
171 <dimen name="fre_tos_checkbox_padding">12dp</dimen> 173 <dimen name="fre_tos_checkbox_padding">12dp</dimen>
172 174
173 <!-- Account Signin dimensions -->
174 <!-- The Account Signin page appears in the First Run Experience (amongst ot her places), so uses
175 a lot of the fre_* dimensions for consistency. -->
176 <dimen name="signin_image_carousel_width">260dp</dimen>
177 <dimen name="signin_checkmark_size">38dp</dimen>
178
179 <!-- Sign-in promo dimensions --> 175 <!-- Sign-in promo dimensions -->
180 <dimen name="sign_in_promo_padding_bottom">16dp</dimen> 176 <dimen name="sign_in_promo_padding_bottom">16dp</dimen>
181 177
182 <!-- Autofill card unmasking prompt dimensions --> 178 <!-- Autofill card unmasking prompt dimensions -->
183 <dimen name="autofill_card_unmask_tooltip_horizontal_padding">16dp</dimen> 179 <dimen name="autofill_card_unmask_tooltip_horizontal_padding">16dp</dimen>
184 <dimen name="autofill_card_unmask_tooltip_vertical_padding">4dp</dimen> 180 <dimen name="autofill_card_unmask_tooltip_vertical_padding">4dp</dimen>
185 181
186 <!-- Alert dialog --> 182 <!-- Alert dialog -->
187 <dimen name="dialog_padding_top">@dimen/abc_dialog_padding_top_material</dim en> 183 <dimen name="dialog_padding_top">@dimen/abc_dialog_padding_top_material</dim en>
188 <dimen name="dialog_padding_sides">@dimen/abc_dialog_padding_material</dimen > 184 <dimen name="dialog_padding_sides">@dimen/abc_dialog_padding_material</dimen >
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 315
320 <!-- Account chooser dialog dimensions --> 316 <!-- Account chooser dialog dimensions -->
321 <dimen name="account_chooser_dialog_margin">24dp</dimen> 317 <dimen name="account_chooser_dialog_margin">24dp</dimen>
322 <dimen name="account_chooser_dialog_item_margin">20dp</dimen> 318 <dimen name="account_chooser_dialog_item_margin">20dp</dimen>
323 <dimen name="account_chooser_dialog_title_main_text_size">18sp</dimen> 319 <dimen name="account_chooser_dialog_title_main_text_size">18sp</dimen>
324 <dimen name="account_chooser_dialog_title_descriptive_text_size">16sp</dimen > 320 <dimen name="account_chooser_dialog_title_descriptive_text_size">16sp</dimen >
325 321
326 <!-- Clear browsing data preferences dimensions --> 322 <!-- Clear browsing data preferences dimensions -->
327 <dimen name="clear_browsing_data_checkbox_height">56dp</dimen> 323 <dimen name="clear_browsing_data_checkbox_height">56dp</dimen>
328 </resources> 324 </resources>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698