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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1574273002: Unify and Improve the Sign-In and Sync Confirmation Screens on Clank. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 | « no previous file | chrome/android/java/res/values/dimens.xml » ('j') | no next file with comments »
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 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.firstrun.AccountFirstRunView 7 <org.chromium.chrome.browser.firstrun.AccountFirstRunView
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 android:id="@+id/fre_account_layout" 10 android:id="@+id/fre_account_layout"
10 android:layout_width="match_parent" 11 android:layout_width="match_parent"
11 android:layout_height="match_parent" > 12 android:layout_height="match_parent" >
12 13
13 <ScrollView 14 <ScrollView
14 android:layout_width="match_parent" 15 android:layout_width="match_parent"
15 android:layout_height="match_parent" 16 android:layout_height="match_parent"
16 android:layout_marginBottom="57dp" 17 android:layout_marginBottom="76dp"
17 android:fillViewport="true" 18 android:fillViewport="true"
18 android:scrollbarStyle="outsideOverlay" > 19 android:scrollbarStyle="outsideOverlay" >
19 20
20 <LinearLayout 21 <LinearLayout
21 android:id="@+id/fre_account_linear_layout" 22 android:id="@+id/fre_account_linear_layout"
22 android:layout_width="match_parent" 23 android:layout_width="match_parent"
23 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
24 android:gravity="center" 25 android:gravity="center"
25 android:orientation="vertical" > 26 android:orientation="vertical" >
26 27
(...skipping 25 matching lines...) Expand all
52 <LinearLayout 53 <LinearLayout
53 android:layout_width="match_parent" 54 android:layout_width="match_parent"
54 android:layout_height="wrap_content" 55 android:layout_height="wrap_content"
55 android:layout_marginBottom="@dimen/fre_margin" 56 android:layout_marginBottom="@dimen/fre_margin"
56 android:orientation="vertical" 57 android:orientation="vertical"
57 android:gravity="center_horizontal" 58 android:gravity="center_horizontal"
58 android:paddingEnd="24dp" 59 android:paddingEnd="24dp"
59 android:paddingStart="24dp" > 60 android:paddingStart="24dp" >
60 61
61 <Spinner 62 <Spinner
63 style="@style/Widget.AppCompat.Spinner.Underlined"
62 android:id="@+id/google_accounts_spinner" 64 android:id="@+id/google_accounts_spinner"
63 android:layout_width="wrap_content" 65 android:layout_width="wrap_content"
64 android:layout_height="wrap_content" 66 android:layout_height="wrap_content"
65 android:layout_marginBottom="@dimen/fre_margin" 67 android:layout_marginBottom="@dimen/fre_margin"
66 android:padding="0dp" 68 android:padding="0dp"
67 android:textColor="@color/fre_text_color" /> 69 android:textColor="@color/fre_text_color" />
68 70
69 <TextView 71
70 android:id="@+id/description" 72 <FrameLayout
71 android:layout_width="match_parent" 73 android:layout_width="wrap_content"
72 android:layout_height="wrap_content" 74 android:layout_height="wrap_content">
73 android:gravity="center" 75
74 android:lineSpacingMultiplier="1.4" 76 <org.chromium.ui.widget.TextViewWithClickableSpans
75 android:text="@string/fre_account_choice_description" 77 android:id="@+id/description"
76 android:textColor="@color/fre_light_text_color" 78 android:layout_width="match_parent"
77 android:textSize="@dimen/fre_normal_text_size" /> 79 android:layout_height="wrap_content"
80 android:gravity="center_horizontal"
81 android:lineSpacingMultiplier="1.4"
82 android:text="@string/fre_account_choice_description "
83 android:textColor="@color/fre_light_text_color"
84 android:textSize="@dimen/fre_normal_text_size"
85 android:visibility="visible"/>
86
87 <!-- We use an invisible TextView overlapping with the v isible one to keep
88 the layout constant between text changes. This TextView will have its
89 contents programmatically set to the longest string the above TextView can
90 contain. -->
91
92 <org.chromium.ui.widget.TextViewWithClickableSpans
93 android:id="@+id/longest_description"
94 android:layout_width="match_parent"
95 android:layout_height="wrap_content"
96 android:gravity="center"
97 android:lineSpacingMultiplier="1.4"
98 android:textColor="@color/fre_light_text_color"
99 android:textSize="@dimen/fre_normal_text_size"
100 android:visibility="invisible"/>
101
102 </FrameLayout>
103
78 </LinearLayout> 104 </LinearLayout>
79 </LinearLayout> 105 </LinearLayout>
80 </LinearLayout> 106 </LinearLayout>
81 </ScrollView> 107 </ScrollView>
82 108
83 <View android:id="@+id/button_bar_separator"
84 style="@style/ButtonBarTopDivider"
85 android:layout_gravity="bottom"
86 android:layout_marginBottom="56dp" />
87
88 <LinearLayout 109 <LinearLayout
89 android:id="@+id/button_bar" 110 android:id="@+id/button_bar"
90 android:layout_width="match_parent" 111 android:layout_width="match_parent"
91 android:layout_height="56dp" 112 android:layout_height="76dp"
92 android:layout_gravity="bottom" 113 android:layout_gravity="bottom"
93 android:orientation="horizontal" > 114 android:orientation="horizontal"
115 android:padding="@dimen/fre_button_padding" >
94 116
95 <!--suppress ButtonStyle --> 117 <!--suppress ButtonStyle -->
96 <Button 118 <Button
97 android:id="@+id/negative_button" 119 android:id="@+id/negative_button"
98 android:layout_width="0dp" 120 style="@style/ButtonCompatBorderless"
99 android:layout_height="match_parent" 121 android:layout_width="wrap_content"
100 android:layout_weight="1" 122 android:layout_height="wrap_content"
101 android:background="?attr/listChoiceBackgroundIndicator"
102 android:gravity="start|center_vertical"
103 android:textDirection="locale"
104 android:paddingStart="@dimen/fre_button_padding"
105 android:paddingEnd="@dimen/fre_button_padding"
106 android:text="@string/fre_skip_text" 123 android:text="@string/fre_skip_text"
107 android:textAllCaps="true" 124 android:textAllCaps="true"
108 android:textColor="@color/light_normal_color" 125 android:textColor="@color/light_normal_color"
109 android:textSize="@dimen/fre_button_text_size" /> 126 android:textSize="15sp" />
127
128 <View
129 android:layout_width="0dp"
130 android:layout_height="0dp"
131 android:layout_weight="1"
132 android:visibility="invisible"/>
110 133
111 <!--suppress ButtonStyle --> 134 <!--suppress ButtonStyle -->
112 <Button 135 <org.chromium.ui.widget.ButtonCompat
113 android:id="@+id/positive_button" 136 android:id="@+id/positive_button"
114 android:layout_width="0dp" 137 android:layout_width="wrap_content"
115 android:layout_height="match_parent" 138 android:layout_height="wrap_content"
116 android:layout_weight="1"
117 android:background="?attr/listChoiceBackgroundIndicator"
118 android:gravity="end|center_vertical"
119 android:textDirection="locale"
120 android:paddingStart="@dimen/fre_button_padding"
121 android:paddingEnd="@dimen/fre_button_padding"
122 android:text="@string/choose_account_sign_in" 139 android:text="@string/choose_account_sign_in"
123 android:textAllCaps="true" 140 android:textAllCaps="true"
124 android:textColor="@color/light_active_color" 141 android:textColor="@android:color/white"
125 android:textSize="@dimen/fre_button_text_size" /> 142 android:textSize="15sp"
143 chrome:buttonColor="@color/light_active_color" />
144
145 <View
146 android:id="@+id/positive_button_end_padding"
147 android:layout_width="0dp"
148 android:layout_height="0dp"
149 android:layout_weight="1"
150 android:visibility="gone"/>
126 </LinearLayout> 151 </LinearLayout>
127 152
128 </org.chromium.chrome.browser.firstrun.AccountFirstRunView> 153 </org.chromium.chrome.browser.firstrun.AccountFirstRunView>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/values/dimens.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698