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

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

Issue 2427853002: Revert "Inherit default text color from parent themes." (Closed)
Patch Set: 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"
44 android:textSize="@dimen/fre_title_text_size" 45 android:textSize="@dimen/fre_title_text_size"
45 android:text="@string/sign_in_to_chrome"/> 46 android:text="@string/sign_in_to_chrome"/>
46 47
47 <View 48 <View
48 android:layout_width="match_parent" 49 android:layout_width="match_parent"
49 android:layout_height="1dp" 50 android:layout_height="1dp"
50 android:background="@color/signin_border_line_color" 51 android:background="@color/signin_border_line_color"
51 android:alpha="0.08"/> 52 android:alpha="0.08"/>
52 53
53 <TextView 54 <TextView
54 android:id="@+id/signin_choice_description" 55 android:id="@+id/signin_choice_description"
55 android:layout_width="wrap_content" 56 android:layout_width="wrap_content"
56 android:layout_height="wrap_content" 57 android:layout_height="wrap_content"
57 android:padding="@dimen/signin_chooser_padding" 58 android:padding="@dimen/signin_chooser_padding"
58 android:lineSpacingMultiplier="1.4" 59 android:lineSpacingMultiplier="1.4"
59 android:text="@string/signin_account_choice_description" 60 android:text="@string/signin_account_choice_description"
61 android:textColor="@color/default_text_color"
60 android:textSize="@dimen/fre_normal_text_size"/> 62 android:textSize="@dimen/fre_normal_text_size"/>
61 </LinearLayout> 63 </LinearLayout>
62 </org.chromium.chrome.browser.signin.AccountSigninChooseView> 64 </org.chromium.chrome.browser.signin.AccountSigninChooseView>
63 65
64 <!-- The view that allows the user to confirm signed in account, sync an d service personalization --> 66 <!-- The view that allows the user to confirm signed in account, sync an d service personalization -->
65 <org.chromium.chrome.browser.signin.AccountSigninConfirmationView 67 <org.chromium.chrome.browser.signin.AccountSigninConfirmationView
66 android:id="@+id/signin_confirmation_view" 68 android:id="@+id/signin_confirmation_view"
67 android:layout_width="match_parent" 69 android:layout_width="match_parent"
68 android:layout_height="match_parent" 70 android:layout_height="match_parent"
69 android:scrollbars="none" 71 android:scrollbars="none"
(...skipping 23 matching lines...) Expand all
93 android:layout_height="64dp" 95 android:layout_height="64dp"
94 android:layout_marginBottom="24dp" 96 android:layout_marginBottom="24dp"
95 android:scaleType="fitCenter" 97 android:scaleType="fitCenter"
96 android:contentDescription="@null"/> 98 android:contentDescription="@null"/>
97 99
98 <TextView 100 <TextView
99 android:id="@+id/signin_account_name" 101 android:id="@+id/signin_account_name"
100 android:layout_width="match_parent" 102 android:layout_width="match_parent"
101 android:layout_height="wrap_content" 103 android:layout_height="wrap_content"
102 android:layout_marginBottom="8dp" 104 android:layout_marginBottom="8dp"
105 android:textColor="@color/default_text_color"
103 android:textSize="@dimen/fre_title_text_size" 106 android:textSize="@dimen/fre_title_text_size"
104 android:ellipsize="end" 107 android:ellipsize="end"
105 android:maxLines="1"/> 108 android:maxLines="1"/>
106 109
107 <TextView 110 <TextView
108 android:id="@+id/signin_account_email" 111 android:id="@+id/signin_account_email"
109 android:layout_width="match_parent" 112 android:layout_width="match_parent"
110 android:layout_height="wrap_content" 113 android:layout_height="wrap_content"
111 android:layout_marginBottom="16dp" 114 android:layout_marginBottom="16dp"
112 android:textColor="@color/descriptive_text_color" 115 android:textColor="@color/descriptive_text_color"
(...skipping 13 matching lines...) Expand all
126 <TextView 129 <TextView
127 android:id="@+id/signin_chrome_sync_title" 130 android:id="@+id/signin_chrome_sync_title"
128 android:layout_width="match_parent" 131 android:layout_width="match_parent"
129 android:layout_height="wrap_content" 132 android:layout_height="wrap_content"
130 android:layout_marginTop="16dp" 133 android:layout_marginTop="16dp"
131 android:layout_marginBottom="8dp" 134 android:layout_marginBottom="8dp"
132 android:layout_below="@id/signin_confirmation_head_body_bord er" 135 android:layout_below="@id/signin_confirmation_head_body_bord er"
133 android:paddingStart="16dp" 136 android:paddingStart="16dp"
134 android:paddingEnd="16dp" 137 android:paddingEnd="16dp"
135 android:text="@string/sync_confirmation_chrome_sync_title" 138 android:text="@string/sync_confirmation_chrome_sync_title"
139 android:textColor="@color/default_text_color"
136 android:textSize="@dimen/fre_normal_text_size" 140 android:textSize="@dimen/fre_normal_text_size"
137 android:fontFamily="sans-serif-medium" 141 android:fontFamily="sans-serif-medium"
138 android:drawableStart="@drawable/chrome_sync_logo" 142 android:drawableStart="@drawable/chrome_sync_logo"
139 android:drawablePadding="16dp"/> 143 android:drawablePadding="16dp"/>
140 144
141 <TextView 145 <TextView
142 android:id="@+id/signin_chrome_sync_description" 146 android:id="@+id/signin_chrome_sync_description"
143 android:layout_width="match_parent" 147 android:layout_width="match_parent"
144 android:layout_height="wrap_content" 148 android:layout_height="wrap_content"
145 android:layout_marginBottom="16dp" 149 android:layout_marginBottom="16dp"
(...skipping 18 matching lines...) Expand all
164 <TextView 168 <TextView
165 android:id="@+id/signin_personalize_service_title" 169 android:id="@+id/signin_personalize_service_title"
166 android:layout_width="match_parent" 170 android:layout_width="match_parent"
167 android:layout_height="wrap_content" 171 android:layout_height="wrap_content"
168 android:layout_marginTop="16dp" 172 android:layout_marginTop="16dp"
169 android:layout_marginBottom="8dp" 173 android:layout_marginBottom="8dp"
170 android:layout_below="@id/signin_confirmation_body_rule_line " 174 android:layout_below="@id/signin_confirmation_body_rule_line "
171 android:paddingStart="16dp" 175 android:paddingStart="16dp"
172 android:paddingEnd="16dp" 176 android:paddingEnd="16dp"
173 android:text="@string/sync_confirmation_personalize_services _title" 177 android:text="@string/sync_confirmation_personalize_services _title"
178 android:textColor="@color/default_text_color"
174 android:textSize="@dimen/fre_normal_text_size" 179 android:textSize="@dimen/fre_normal_text_size"
175 android:fontFamily="sans-serif-medium" 180 android:fontFamily="sans-serif-medium"
176 android:drawableStart="@drawable/googleg" 181 android:drawableStart="@drawable/googleg"
177 android:drawablePadding="16dp"/> 182 android:drawablePadding="16dp"/>
178 183
179 <TextView 184 <TextView
180 android:id="@+id/signin_personalize_service_description" 185 android:id="@+id/signin_personalize_service_description"
181 android:layout_width="match_parent" 186 android:layout_width="match_parent"
182 android:layout_height="wrap_content" 187 android:layout_height="wrap_content"
183 android:layout_marginBottom="32dp" 188 android:layout_marginBottom="32dp"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 269
265 <View 270 <View
266 android:id="@+id/positive_button_end_padding" 271 android:id="@+id/positive_button_end_padding"
267 android:layout_width="0dp" 272 android:layout_width="0dp"
268 android:layout_height="0dp" 273 android:layout_height="0dp"
269 android:layout_weight="1" 274 android:layout_weight="1"
270 android:visibility="gone"/> 275 android:visibility="gone"/>
271 </LinearLayout> 276 </LinearLayout>
272 277
273 </org.chromium.chrome.browser.signin.AccountSigninView> 278 </org.chromium.chrome.browser.signin.AccountSigninView>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698