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

Side by Side Diff: chrome/android/java/res/layout/account_signin_view.xml

Issue 2365733002: Inherit default text color from MainTheme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: swapping out @ColorRes and @ColorInt usage in code. Created 4 years, 2 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 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 3
4 Use of this source code is governed by a BSD-style license that can be 4 Use of this source code is governed by a BSD-style license that can be
5 found in the LICENSE file. 5 found in the LICENSE file.
6 --> 6 -->
7 <org.chromium.chrome.browser.signin.AccountSigninView 7 <org.chromium.chrome.browser.signin.AccountSigninView
8 xmlns:android="http://schemas.android.com/apk/res/android" 8 xmlns:android="http://schemas.android.com/apk/res/android"
9 xmlns:chrome="http://schemas.android.com/apk/res-auto" 9 xmlns:chrome="http://schemas.android.com/apk/res-auto"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
(...skipping 23 matching lines...) Expand all
34 <!-- The layout_width/layout_height is set to 16/9 dynamically i n Java --> 34 <!-- The layout_width/layout_height is set to 16/9 dynamically i n Java -->
35 <TextView 35 <TextView
36 android:id="@+id/signin_title" 36 android:id="@+id/signin_title"
37 android:layout_width="match_parent" 37 android:layout_width="match_parent"
38 android:layout_height="wrap_content" 38 android:layout_height="wrap_content"
39 android:gravity="bottom" 39 android:gravity="bottom"
40 android:paddingStart="@dimen/signin_chooser_padding" 40 android:paddingStart="@dimen/signin_chooser_padding"
41 android:paddingEnd="@dimen/signin_chooser_padding" 41 android:paddingEnd="@dimen/signin_chooser_padding"
42 android:paddingBottom="@dimen/signin_chooser_padding" 42 android:paddingBottom="@dimen/signin_chooser_padding"
43 android:background="@color/signin_head_background" 43 android:background="@color/signin_head_background"
44 android:textColor="@color/default_text_color"
45 android:textSize="@dimen/fre_title_text_size" 44 android:textSize="@dimen/fre_title_text_size"
46 android:text="@string/sign_in_to_chrome"/> 45 android:text="@string/sign_in_to_chrome"/>
47 46
48 <View 47 <View
49 android:layout_width="match_parent" 48 android:layout_width="match_parent"
50 android:layout_height="1dp" 49 android:layout_height="1dp"
51 android:background="@color/signin_border_line_color" 50 android:background="@color/signin_border_line_color"
52 android:alpha="0.08"/> 51 android:alpha="0.08"/>
53 52
54 <TextView 53 <TextView
55 android:id="@+id/signin_choice_description" 54 android:id="@+id/signin_choice_description"
56 android:layout_width="wrap_content" 55 android:layout_width="wrap_content"
57 android:layout_height="wrap_content" 56 android:layout_height="wrap_content"
58 android:padding="@dimen/signin_chooser_padding" 57 android:padding="@dimen/signin_chooser_padding"
59 android:lineSpacingMultiplier="1.4" 58 android:lineSpacingMultiplier="1.4"
60 android:text="@string/signin_account_choice_description" 59 android:text="@string/signin_account_choice_description"
61 android:textColor="@color/default_text_color"
62 android:textSize="@dimen/fre_normal_text_size"/> 60 android:textSize="@dimen/fre_normal_text_size"/>
63 </LinearLayout> 61 </LinearLayout>
64 </org.chromium.chrome.browser.signin.AccountSigninChooseView> 62 </org.chromium.chrome.browser.signin.AccountSigninChooseView>
65 63
66 <!-- The view that allows the user to confirm signed in account, sync an d service personalization --> 64 <!-- The view that allows the user to confirm signed in account, sync an d service personalization -->
67 <org.chromium.chrome.browser.signin.AccountSigninConfirmationView 65 <org.chromium.chrome.browser.signin.AccountSigninConfirmationView
68 android:id="@+id/signin_confirmation_view" 66 android:id="@+id/signin_confirmation_view"
69 android:layout_width="match_parent" 67 android:layout_width="match_parent"
70 android:layout_height="match_parent" 68 android:layout_height="match_parent"
71 android:scrollbars="none" 69 android:scrollbars="none"
(...skipping 23 matching lines...) Expand all
95 android:layout_height="64dp" 93 android:layout_height="64dp"
96 android:layout_marginBottom="24dp" 94 android:layout_marginBottom="24dp"
97 android:scaleType="fitCenter" 95 android:scaleType="fitCenter"
98 android:contentDescription="@null"/> 96 android:contentDescription="@null"/>
99 97
100 <TextView 98 <TextView
101 android:id="@+id/signin_account_name" 99 android:id="@+id/signin_account_name"
102 android:layout_width="match_parent" 100 android:layout_width="match_parent"
103 android:layout_height="wrap_content" 101 android:layout_height="wrap_content"
104 android:layout_marginBottom="8dp" 102 android:layout_marginBottom="8dp"
105 android:textColor="@color/default_text_color"
106 android:textSize="@dimen/fre_title_text_size" 103 android:textSize="@dimen/fre_title_text_size"
107 android:ellipsize="end" 104 android:ellipsize="end"
108 android:maxLines="1"/> 105 android:maxLines="1"/>
109 106
110 <TextView 107 <TextView
111 android:id="@+id/signin_account_email" 108 android:id="@+id/signin_account_email"
112 android:layout_width="match_parent" 109 android:layout_width="match_parent"
113 android:layout_height="wrap_content" 110 android:layout_height="wrap_content"
114 android:layout_marginBottom="16dp" 111 android:layout_marginBottom="16dp"
115 android:textColor="@color/descriptive_text_color" 112 android:textColor="@color/descriptive_text_color"
(...skipping 13 matching lines...) Expand all
129 <TextView 126 <TextView
130 android:id="@+id/signin_chrome_sync_title" 127 android:id="@+id/signin_chrome_sync_title"
131 android:layout_width="match_parent" 128 android:layout_width="match_parent"
132 android:layout_height="wrap_content" 129 android:layout_height="wrap_content"
133 android:layout_marginTop="16dp" 130 android:layout_marginTop="16dp"
134 android:layout_marginBottom="8dp" 131 android:layout_marginBottom="8dp"
135 android:layout_below="@id/signin_confirmation_head_body_bord er" 132 android:layout_below="@id/signin_confirmation_head_body_bord er"
136 android:paddingStart="16dp" 133 android:paddingStart="16dp"
137 android:paddingEnd="16dp" 134 android:paddingEnd="16dp"
138 android:text="@string/sync_confirmation_chrome_sync_title" 135 android:text="@string/sync_confirmation_chrome_sync_title"
139 android:textColor="@color/default_text_color"
140 android:textSize="@dimen/fre_normal_text_size" 136 android:textSize="@dimen/fre_normal_text_size"
141 android:fontFamily="sans-serif-medium" 137 android:fontFamily="sans-serif-medium"
142 android:drawableStart="@drawable/chrome_sync_logo" 138 android:drawableStart="@drawable/chrome_sync_logo"
143 android:drawablePadding="16dp"/> 139 android:drawablePadding="16dp"/>
144 140
145 <TextView 141 <TextView
146 android:id="@+id/signin_chrome_sync_description" 142 android:id="@+id/signin_chrome_sync_description"
147 android:layout_width="match_parent" 143 android:layout_width="match_parent"
148 android:layout_height="wrap_content" 144 android:layout_height="wrap_content"
149 android:layout_marginBottom="16dp" 145 android:layout_marginBottom="16dp"
(...skipping 18 matching lines...) Expand all
168 <TextView 164 <TextView
169 android:id="@+id/signin_personalize_service_title" 165 android:id="@+id/signin_personalize_service_title"
170 android:layout_width="match_parent" 166 android:layout_width="match_parent"
171 android:layout_height="wrap_content" 167 android:layout_height="wrap_content"
172 android:layout_marginTop="16dp" 168 android:layout_marginTop="16dp"
173 android:layout_marginBottom="8dp" 169 android:layout_marginBottom="8dp"
174 android:layout_below="@id/signin_confirmation_body_rule_line " 170 android:layout_below="@id/signin_confirmation_body_rule_line "
175 android:paddingStart="16dp" 171 android:paddingStart="16dp"
176 android:paddingEnd="16dp" 172 android:paddingEnd="16dp"
177 android:text="@string/sync_confirmation_personalize_services _title" 173 android:text="@string/sync_confirmation_personalize_services _title"
178 android:textColor="@color/default_text_color"
179 android:textSize="@dimen/fre_normal_text_size" 174 android:textSize="@dimen/fre_normal_text_size"
180 android:fontFamily="sans-serif-medium" 175 android:fontFamily="sans-serif-medium"
181 android:drawableStart="@drawable/googleg" 176 android:drawableStart="@drawable/googleg"
182 android:drawablePadding="16dp"/> 177 android:drawablePadding="16dp"/>
183 178
184 <TextView 179 <TextView
185 android:id="@+id/signin_personalize_service_description" 180 android:id="@+id/signin_personalize_service_description"
186 android:layout_width="match_parent" 181 android:layout_width="match_parent"
187 android:layout_height="wrap_content" 182 android:layout_height="wrap_content"
188 android:layout_marginBottom="32dp" 183 android:layout_marginBottom="32dp"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 258
264 <View 259 <View
265 android:id="@+id/positive_button_end_padding" 260 android:id="@+id/positive_button_end_padding"
266 android:layout_width="0dp" 261 android:layout_width="0dp"
267 android:layout_height="0dp" 262 android:layout_height="0dp"
268 android:layout_weight="1" 263 android:layout_weight="1"
269 android:visibility="gone"/> 264 android:visibility="gone"/>
270 </LinearLayout> 265 </LinearLayout>
271 266
272 </org.chromium.chrome.browser.signin.AccountSigninView> 267 </org.chromium.chrome.browser.signin.AccountSigninView>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698